[FEAT] Integrate argocd with gitlab in k3d cluster by LeaYeh · Pull Request #6 · 42-CC-RNCP/Inception-of-Things

LeaYeh · 2025-10-29T11:07:19Z

The gitlab is been installed in the k3d cluster as the requirements.
To launch it the flow are:

make up # install gitlab in the cluster and install argocd
make pf # port-forwarding for ssh and http serives
mae setup # set up gitlab PAT and use the same ssh-key for connecting gitlab and argocd

Copilot

Pull Request Overview

This PR significantly expands the infrastructure setup capabilities by adding comprehensive tooling for multi-architecture support and GitLab integration. The changes transform a simple Vagrant installer into a flexible, production-ready DevOps toolkit.

Enhanced setup_host.sh to support both Vagrant (Part 1/2) and Kubernetes stack (Part 3), with ARM64 architecture support
Added Part 3 implementation with Argo CD bootstrap scripts and Kubernetes manifests
Introduced bonus section with full GitLab installation, account setup, and Argo CD integration for SSH-based GitOps workflows

Reviewed Changes

Copilot reviewed 16 out of 17 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
scripts/setup_host.sh	Complete rewrite: modular architecture detection, multi-arch VM provider support (VirtualBox/libvirt), Docker/kubectl/k3d installation with configurable options
p3/tools/bootstrap_argocd.sh	New Argo CD bootstrapping script with k3d cluster creation, ServiceLB waiting, and application deployment
p3/Makefile	New build automation for Part 3 with cluster lifecycle management
p3/manifests/*	New Kubernetes manifests for playground app deployment via Argo CD
bonus/scripts/install_gitlab.sh	New GitLab Helm installation with constrained resource mode, database migrations, and root user provisioning
bonus/scripts/setup_gitlab_account.sh	New GitLab user creation and SSH key management via REST API
bonus/scripts/bootstrap_argocd.sh	Extended Argo CD bootstrap with GitLab SSH integration and repo-creds setup
bonus/Makefile	New comprehensive GitLab lifecycle management with port-forwarding, migrations, and cleanup targets
bonus/manifests/*	New Kubernetes manifests and Kustomize configs for bonus deployment
bonus/confs/gitlab.constrained.yaml	New GitLab Helm values for resource-constrained environments
.gitignore	Added .gitlab.env to ignore list

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-10-29T11:11:00Z

+  log "Installing Docker (official script)..."
+  curl -fsSL https://get.docker.com | sh
+  sudo usermod -aG docker "$USER" || true
+  newgrp docker


The newgrp docker command will start a new shell session and won't affect the current script execution flow. This is ineffective in a script context and should be removed. Users should be instructed to re-login or manually run newgrp docker after the script completes, similar to the warning at line 231.

Suggested change

newgrp docker

warn "You must re-login or run 'newgrp docker' for group changes to take effect."

Copilot · 2025-10-29T11:11:01Z

+	@if [ -n "$${REPO_PAT:-}" ]; then \
+	  echo "✅ REPO_PAT already set in environment, skipping creation."; \
+	  exit 0; \
+	  return 0; \


Both exit 0 and return 0 are present, but return is not valid in a shell script executed by Make (only in functions). The return 0 line will never execute because exit 0 terminates the shell. Remove line 112.

Suggested change

return 0; \

Copilot · 2025-10-29T11:11:01Z

+	@unset GITLAB_ROOT_PASSWORD || true
+	@unset REPO_PAT || true


The unset command has no effect in Make recipes because each recipe line runs in a separate shell. These lines don't actually unset the environment variables. If the intent is to document cleanup, convert these to comments. If the intent is to remove from .gitlab.env, use sed or similar to edit the file.

Suggested change

@unset GITLAB_ROOT_PASSWORD || true

@unset REPO_PAT || true

# If you need to clean up sensitive environment variables, do so in your shell.

# The unset command has no effect in Make recipes.

Copilot · 2025-10-29T11:11:01Z

+}
+
+install_virtualbox_amd64() {
+  log "installing VirtualBox (amd64) as Vagrant provider..."


Corrected capitalization: 'installing' should be 'Installing' to match the capitalization style used in other log messages throughout the script (lines 100, 128, 157, etc.).

Suggested change

log "installing VirtualBox (amd64) as Vagrant provider..."

log "Installing VirtualBox (amd64) as Vagrant provider..."

Copilot · 2025-10-29T11:11:02Z

+}
+
+install_libvirt_arm64() {
+  log "installing libvirt + QEMU (arm64) as Vagrant provider..."


Corrected capitalization: 'installing' should be 'Installing' to match the capitalization style used in other log messages throughout the script.

Suggested change

log "installing libvirt + QEMU (arm64) as Vagrant provider..."

log "Installing libvirt + QEMU (arm64) as Vagrant provider..."

Copilot · 2025-10-29T11:11:02Z

+
+  local PASS="${GITLAB_ROOT_PASSWORD:-${GITLAB_ROOT_PASSWORD_FILE:-}}"
+  if [[ -z "$PASS" ]]; then
+    PASS='ChangeMe_+VeryStrong#2025'


Hardcoded default password 'ChangeMe_+VeryStrong#2025' is a security concern. While intended as a temporary password, it's predictable and could be exploited if not changed. Consider generating a random password by default using openssl rand -base64 24 or similar, even when GITLAB_ROOT_PASSWORD is not set.

Suggested change

PASS='ChangeMe_+VeryStrong#2025'

need openssl

PASS="$(openssl rand -base64 24)"

Copilot · 2025-10-29T11:11:03Z

+# TODO: Need to change the branch name to main later
+REVISION="${REVISION:-lea/bonus}"


TODO comment indicates temporary branch name 'lea/bonus'. This should be addressed before merging to production. Either update to the intended default branch (e.g., 'main') or create a tracking issue and reference it in the comment.

Suggested change

# TODO: Need to change the branch name to main later

REVISION="${REVISION:-lea/bonus}"

# Branch name set to 'main' for production use

REVISION="${REVISION:-main}"

Copilot · 2025-10-29T11:11:03Z

+die()  { echo -e "❌ $*" >&2; exit 1; }
+
+DISTRO_CODENAME="$(lsb_release -cs 2>/dev/null || echo bookworm)"
+ARCH_DEB="$(dpkg --print-architecture)"    


Trailing whitespace detected at end of line. Remove the trailing spaces for cleaner code.

Suggested change

ARCH_DEB="$(dpkg --print-architecture)"

ARCH_DEB="$(dpkg --print-architecture)"

Copilot · 2025-10-29T11:11:03Z

+
+

Empty line with trailing whitespace. Remove the trailing spaces for cleaner code.

Suggested change

Copilot · 2025-10-29T11:11:04Z

+
+

Empty line with trailing whitespace. Remove the trailing spaces for cleaner code.

Suggested change

LeaYeh added 22 commits October 5, 2025 17:59

refactor: Restructure setup script for part3

89597f8

chore: Move boostrap argocd out of the setup host vm script

c6e1d50

feat: Setup admin and apply application config

353fbc1

feat: Config kustomize for argocd and app

ff4ec44

build: Add port forwarding for app

04613c1

build: Change the service type to loadbalancer

ac0ef8b

build: Add makefile to simplfy the cmd

8476190

fix: Change app name

5600cdd

build: Config gitlab install spec with constrained resource

0364698

chore: Copy the argocd setting

ca3c567

build: Install gitlab in the basic way

30edc66

fix: Change the port forward to the Workhorse but not the rails

d6f4def

feat: Add hint for gitlab repo and remote setting

007f3b6

feat: Config the argocd to connect to the local gitlab

cc23d88

chore: Add ignore rule for .env file

fe6c424

feat: Add script to add a new gitlab account and the ssh key

127cecb

opt: Make the argocd config can get env var

6b9d363

build: Extern the cmd for the launch process

8410a16

rec: Add record for the healthy gitlab installation

3ccdbf6

fix: Remove the default value which is not support

18a203d

chore: Enrich the info after account setting

813a607

build: Connect argocd with gitlab by sh key

73bb050

LeaYeh requested review from Copilot, pueptastisch and vhappenh October 29, 2025 11:07

Copilot AI reviewed Oct 29, 2025

View reviewed changes

Navigation Menu

Uh oh!

[FEAT] Integrate argocd with gitlab in k3d cluster - #6

[FEAT] Integrate argocd with gitlab in k3d cluster#6
LeaYeh wants to merge 22 commits into
mainfrom
lea/bonus

LeaYeh commented Oct 29, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Copilot AI Oct 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	newgrp docker
	warn "You must re-login or run 'newgrp docker' for group changes to take effect."

	log "installing VirtualBox (amd64) as Vagrant provider..."
	log "Installing VirtualBox (amd64) as Vagrant provider..."

	log "installing libvirt + QEMU (arm64) as Vagrant provider..."
	log "Installing libvirt + QEMU (arm64) as Vagrant provider..."

	PASS='ChangeMe_+VeryStrong#2025'
	need openssl
	PASS="$(openssl rand -base64 24)"

		# TODO: Need to change the branch name to main later
		REVISION="${REVISION:-lea/bonus}"

	ARCH_DEB="$(dpkg --print-architecture)"
	ARCH_DEB="$(dpkg --print-architecture)"

Uh oh!

Conversation

LeaYeh commented Oct 29, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants