fix: Move the port forwards to higher ports to avoid conflicts with existing services

sunib · sunib · commit 189bee2ac7ce · 2025-11-11T15:43:01.000+01:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -151,7 +151,8 @@ RUN usermod -aG docker vscode
 # Ensure vscode user owns Go directories and has proper permissions
 RUN mkdir -p /go && chown -R vscode:vscode /go
 
-# Fix Docker socket permissions for non-root access
+# Fix Docker socket permissions for non-root access (will be applied at runtime)
+# Note: This is set in devcontainer.json postCreateCommand as well
 RUN chmod 666 /var/run/docker.sock || true
 
 # Switch back to vscode user for development
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -21,15 +21,15 @@
     "--group-add=docker"
   ],
   "forwardPorts": [
-    3000,
-    9090
+    13000,
+    19090
   ],
   "portsAttributes": {
-    "3000": {
+    "13000": {
       "label": "Gitea",
       "onAutoForward": "notify"
     },
-    "9090": {
+    "19090": {
       "label": "Prometheus",
       "onAutoForward": "notify"
     }
@@ -61,7 +61,7 @@
       ]
     }
   },
-  "postCreateCommand": "docker network create -d=bridge --subnet=172.19.0.0/24 kind || true",
+  "postCreateCommand": "sudo chmod 666 /var/run/docker.sock || true && docker network create -d=bridge --subnet=172.19.0.0/24 kind || true",
   "remoteUser": "vscode",
   "mounts": [
     "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
diff --git a/Makefile b/Makefile
@@ -228,8 +228,8 @@ setup-port-forwards: ## Start all port-forwards in background
 .PHONY: cleanup-port-forwards
 cleanup-port-forwards: ## Stop all port-forwards
 	@echo "🛑 Stopping port-forwards..."
-	@-pkill -f "kubectl.*port-forward.*3000" 2>/dev/null || true
-	@-pkill -f "kubectl.*port-forward.*9090" 2>/dev/null || true
+	@-pkill -f "kubectl.*port-forward.*13000" 2>/dev/null || true
+	@-pkill -f "kubectl.*port-forward.*19090" 2>/dev/null || true
 	@echo "✅ Port-forwards stopped"
 
 .PHONY: cleanup-gitea-e2e
diff --git a/config/samples/configbutler.ai_v1alpha1_gitrepoconfig.yaml b/config/samples/configbutler.ai_v1alpha1_gitrepoconfig.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
   name: gitrepoconfig-sample
 spec:
-  repoUrl: "http://gitea-http.gitea-e2e.svc.cluster.local:3000/testorg/testrepo.git"
+  repoUrl: "http://gitea-http.gitea-e2e.svc.cluster.local:13000/testorg/testrepo.git"
   allowedBranches:
     - "main"
   secretRef:
diff --git a/test/e2e/E2E_DEBUGGING.md b/test/e2e/E2E_DEBUGGING.md
@@ -14,8 +14,8 @@ make setup-port-forwards
 ```
 
 This exposes:
-- **Prometheus**: http://localhost:9090
-- **Gitea**: http://localhost:3000 (Username: `testorg`, Password: `gitea`)
+- **Prometheus**: http://localhost:19090
+- **Gitea**: http://localhost:13000 (Username: `testorg`, Password: `gitea`)
 
 **Stop port-forwards:**
 ```bash
@@ -60,7 +60,7 @@ go_goroutines{job="gitops-reverser-metrics"}
 ## Network Architecture
 
 ```
-Host Machine (port 3000, 9090)
+Host Machine (port 13000, 19090)
     ↕ (exposed via --network=host)
 DevContainer
     ↕ (kubectl port-forward)
@@ -82,12 +82,12 @@ Kind Cluster
 
 2. **Check Prometheus for metrics history:**
    ```bash
-   # Visit http://localhost:9090
+   # Visit http://localhost:19090
    ```
 
 3. **Check Gitea for repository state:**
    ```bash
-   # Visit http://localhost:3000
+   # Visit http://localhost:13000
    # Username: testorg, Password: gitea
    ```
 
@@ -97,7 +97,7 @@ Kind Cluster
    ```
 
 5. **Check Prometheus scrape status:**
-   Visit http://localhost:9090/targets
+   Visit http://localhost:19090/targets
 
 ## Cleanup
 
@@ -113,7 +113,7 @@ make cleanup-gitea-e2e
 ## Available Make Targets
 
 ```bash
-make setup-port-forwards    # Start port-forwards (Gitea:3000, Prometheus:9090)
+make setup-port-forwards    # Start port-forwards (Gitea:13000, Prometheus:19090)
 make cleanup-port-forwards  # Stop all port-forwards
 make e2e-setup             # Setup Gitea + Prometheus + port-forwards
 make test-e2e              # Run e2e tests (includes port-forwards)
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -33,7 +33,7 @@ import (
 )
 
 // giteaRepoURLTemplate is the URL template for test Gitea repositories.
-const giteaRepoURLTemplate = "http://gitea-http.gitea-e2e.svc.cluster.local:3000/testorg/%s.git"
+const giteaRepoURLTemplate = "http://gitea-http.gitea-e2e.svc.cluster.local:13000/testorg/%s.git"
 const giteaSSHURLTemplate = "ssh://git@gitea-ssh.gitea-e2e.svc.cluster.local:2222/testorg/%s.git"
 
 var testRepoName string
@@ -119,8 +119,8 @@ var _ = Describe("Manager", Ordered, func() {
 		fmt.Printf("═══════════════════════════════════════════════════════════\n")
 		fmt.Printf("📊 E2E Infrastructure kept running for debugging purposes:\n")
 		fmt.Printf("═══════════════════════════════════════════════════════════\n")
-		fmt.Printf("  Prometheus: http://localhost:9090\n")
-		fmt.Printf("  Gitea:      http://localhost:3000\n")
+		fmt.Printf("  Prometheus: http://localhost:19090\n")
+		fmt.Printf("  Gitea:      http://localhost:13000\n")
 		fmt.Printf("\n")
 		fmt.Printf("═══════════════════════════════════════════════════════════\n")
 		fmt.Printf("\n")
diff --git a/test/e2e/gitea-values.yaml b/test/e2e/gitea-values.yaml
@@ -25,9 +25,9 @@ gitea:
     # Server configuration
     server:
       PROTOCOL: http
-      HTTP_PORT: 3000
+      HTTP_PORT: 13000
       DOMAIN: gitea-http.gitea-e2e.svc.cluster.local
-      ROOT_URL: "http://gitea-http.gitea-e2e.svc.cluster.local:3000/"
+      ROOT_URL: "http://gitea-http.gitea-e2e.svc.cluster.local:13000/"
       SSH_DOMAIN: gitea-ssh.gitea-e2e.svc.cluster.local
       SSH_PORT: 22
       START_SSH_SERVER: true
@@ -65,7 +65,7 @@ gitea:
 service:
   http:
     type: ClusterIP
-    port: 3000
+    port: 13000
   ssh:
     type: ClusterIP
     port: 22
diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
@@ -109,7 +109,7 @@ func waitForMetric(query string, condition func(float64) bool, timeout time.Dura
 
 // getPrometheusURL returns the URL for accessing Prometheus UI
 func getPrometheusURL() string {
-	return "http://localhost:9090"
+	return "http://localhost:19090"
 }
 
 // renderTemplate loads and executes a Go template file with the given data
diff --git a/test/e2e/prometheus/deployment.yaml b/test/e2e/prometheus/deployment.yaml
@@ -87,12 +87,12 @@ spec:
         livenessProbe:
           httpGet:
             path: /-/healthy
-            port: 9090
+            port: http
           initialDelaySeconds: 10
         readinessProbe:
           httpGet:
             path: /-/ready
-            port: 9090
+            port: http
           initialDelaySeconds: 5
         volumeMounts:
         - name: config
@@ -126,5 +126,5 @@ spec:
     app: prometheus
   ports:
   - name: http
-    port: 9090
-    targetPort: 9090
+    port: 19090
+    targetPort: http
diff --git a/test/e2e/scripts/setup-gitea.sh b/test/e2e/scripts/setup-gitea.sh
@@ -14,7 +14,7 @@ SECRET_NAME="git-creds"
 SSH_SECRET_NAME="git-creds-ssh"
 SSH_KEY_PATH="/tmp/e2e-ssh-key"
 SSH_PUB_KEY_PATH="/tmp/e2e-ssh-key.pub"
-API_URL="http://localhost:3000/api/v1"
+API_URL="http://localhost:13000/api/v1"
 
 if [ -z "$REPO_NAME" ]; then
     echo "❌ Error: Repository name must be provided as first argument"
@@ -281,12 +281,12 @@ checkout_repository() {
     # Create parent directory
     mkdir -p "$(dirname "$CHECKOUT_DIR")"
     
-    # Configure git for localhost:3000 authentication using credentials
+    # Configure git for localhost:13000 authentication using credentials
     # This creates a global git config that maps the localhost URL to use our credentials
-    REPO_URL_WITH_AUTH="http://$ADMIN_USER:$TOKEN@localhost:3000/$ORG_NAME/$REPO_NAME.git"
-    REPO_URL_LOCALHOST="http://localhost:3000/$ORG_NAME/$REPO_NAME.git"
+    REPO_URL_WITH_AUTH="http://$ADMIN_USER:$TOKEN@localhost:13000/$ORG_NAME/$REPO_NAME.git"
+    REPO_URL_LOCALHOST="http://localhost:13000/$ORG_NAME/$REPO_NAME.git"
     
-    echo "🔐 Configuring git authentication for localhost:3000..."
+    echo "🔐 Configuring git authentication for localhost:13000..."
     # Set up URL rewriting so git will use our credentials automatically
     git config --global "url.$REPO_URL_WITH_AUTH.insteadOf" "$REPO_URL_LOCALHOST"
     
@@ -299,7 +299,7 @@ checkout_repository() {
         git config user.name "E2E Test"
         git config user.email "e2e-test@gitops-reverser.local"
         
-        # Set up the remote URL to use localhost:3000 (authentication is handled by global config)
+        # Set up the remote URL to use localhost:13000 (authentication is handled by global config)
         git remote set-url origin "$REPO_URL_LOCALHOST"
         
         echo "🔧 Git configuration completed in checkout directory"
@@ -327,7 +327,7 @@ setup_credentials
 checkout_repository
 
 # Repository information
-REPO_URL="http://gitea-http.$GITEA_NAMESPACE.svc.cluster.local:3000/$ORG_NAME/$REPO_NAME.git"
+REPO_URL="http://gitea-http.$GITEA_NAMESPACE.svc.cluster.local:13000/$ORG_NAME/$REPO_NAME.git"
 
 echo "
 🎉 Gitea setup completed successfully!
@@ -346,13 +346,13 @@ echo "
    • Access Token: ${TOKEN:0:8}...
 
 🌐 Access Gitea:
-   • Visit http://localhost:3000 in your browser
+   • Visit http://localhost:13000 in your browser
    • Login: $ADMIN_USER / $ADMIN_PASS
-   • Stop port-forward: pkill -f 'kubectl.*port-forward.*3000'
+   • Stop port-forward: pkill -f 'kubectl.*port-forward.*13000'
 
 📂 Git Repository:
    • Local checkout: $CHECKOUT_DIR
-   • Git operations configured for localhost:3000
+   • Git operations configured for localhost:13000
    • Ready for git pull/fetch operations during tests
 
 ✨ Ready for e2e testing! Port-forward will stay active.
diff --git a/test/e2e/scripts/setup-port-forwards.sh b/test/e2e/scripts/setup-port-forwards.sh
@@ -5,6 +5,12 @@ set -euo pipefail
 GITEA_NAMESPACE=${GITEA_NAMESPACE:-gitea-e2e}
 PROMETHEUS_NAMESPACE=${PROMETHEUS_NAMESPACE:-prometheus-e2e}
 
+# Cleanup old port-forwards
+echo "🧹 Cleaning up old port-forwards..."
+pkill -f "kubectl port-forward.*19090" || true
+pkill -f "kubectl port-forward.*13000" || true
+sleep 1
+
 echo "🔌 Setting up port-forwards for e2e testing..."
 
 # Wait for pods to be ready before attempting port-forwards
@@ -44,34 +50,47 @@ setup_port_forward() {
     fi
 
     echo "🔌 Starting ${service_name} port-forward..."
-    nohup kubectl port-forward --address 0.0.0.0 -n "$namespace" "svc/${service}" "${port}:${port}" >/dev/null 2>&1 &
+    local pf_log="/tmp/${service_name}-pf.log"
+    kubectl port-forward --address 127.0.0.1 -n "$namespace" "svc/${service}" "${port}:${port}" > "$pf_log" 2>&1 &
+    local pf_pid=$!
     
     # Give it time to establish
-    sleep 3
+    sleep 2
     
     # Verify port-forward is working
     echo "⏳ Verifying ${service_name} port-forward..."
-    for i in {1..5}; do
-        if curl -s -f "$health_url" >/dev/null 2>&1; then
+    for i in {1..10}; do
+        # Check if port-forward process is still alive
+        if ! kill -0 $pf_pid 2>/dev/null; then
+            echo "❌ ${service_name} port-forward process died"
+            if [ -f "$pf_log" ]; then
+                echo "   Error log:"
+                cat "$pf_log" | sed 's/^/   /'
+            fi
+            return 1
+        fi
+        
+        # Try to connect to the port
+        if timeout 2 bash -c "echo >/dev/tcp/localhost/${port}" 2>/dev/null; then
             echo "✅ ${service_name} port-forward verified and working"
             return 0
         fi
         
-        if [ $i -eq 5 ]; then
-            echo "❌ Failed to verify ${service_name} port-forward after 5 attempts"
+        if [ $i -eq 10 ]; then
+            echo "❌ Failed to verify ${service_name} port-forward after 10 attempts"
             return 1
         fi
         
-        echo "   Attempt $i/5 failed, retrying in 2 seconds..."
-        sleep 2
+        echo "   Attempt $i/10 failed, retrying in 1 second..."
+        sleep 1
     done
 }
 
 # Setup port-forwards
-setup_port_forward "Prometheus" "$PROMETHEUS_NAMESPACE" "prometheus" "9090" "http://localhost:9090/-/ready"
-setup_port_forward "Gitea" "$GITEA_NAMESPACE" "gitea-http" "3000" "http://localhost:3000/api/v1/version"
+setup_port_forward "Prometheus" "$PROMETHEUS_NAMESPACE" "prometheus" "19090" "http://localhost:19090/-/ready"
+setup_port_forward "Gitea" "$GITEA_NAMESPACE" "gitea-http" "13000" "http://localhost:13000/api/v1/version"
 
 echo ""
-echo "📊 Prometheus: http://localhost:9090"
-echo "📁 Gitea: http://localhost:3000"
+echo "📊 Prometheus: http://localhost:19090"
+echo "📁 Gitea: http://localhost:13000"
 echo "✅ Port-forwards ready for e2e testing"

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func waitForMetric(query string, condition func(float64) bool, timeout time.Dura`
`109`	`109`
`110`	`110`	`// getPrometheusURL returns the URL for accessing Prometheus UI`
`111`	`111`	`func getPrometheusURL() string {`
`112`		`- return "http://localhost:9090"`
	`112`	`+ return "http://localhost:19090"`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// renderTemplate loads and executes a Go template file with the given data`