Fix dev-gitea svc not ready failure (#345)

Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>

Author: efiacor

deployments/local/replace-gitea-service-ports.yaml

@@ -52,23 +52,9 @@ else
   kpt fn eval \
     --image ghcr.io/kptdev/krm-functions-catalog/set-annotations:v0.1.4 \
     --match-kind Service \
-    --match-name gitea \
+    --match-name gitea-lb \
     --match-namespace gitea \
     -- "metallb.universe.tf/loadBalancerIPs=${gitea_ip}"
- 
-  cp -f "${git_root}/deployments/local/kind_porch_test_cluster.yaml" cluster-config.yaml
- 
-  # Append KRM metadata to the cluster-config
-  cat >> cluster-config.yaml <<EOF
-metadata:
-  name: not-used
-  annotations:
-    config.kubernetes.io/local-config: "true"
-EOF
- 
-  kpt fn eval \
-    --image ghcr.io/kptdev/krm-functions-catalog/apply-replacements:v0.1.1 \
-    --fn-config "${git_root}/deployments/local/replace-gitea-service-ports.yaml"
 fi
 
 kpt fn render
@@ -80,10 +66,10 @@ kubectl wait pod --all --for=condition=Ready --namespace=gitea --timeout=90s
 ###############################################################
 
 h1 Create git repos in gitea
-curl -v -k -H "content-type: application/json" "http://nephio:secret@localhost:3000/api/v1/user/repos" --data "{\"name\":\"$git_repo_name\"}"
+curl -v -k -H "content-type: application/json" "http://nephio:secret@${gitea_ip}:3000/api/v1/user/repos" --data "{\"name\":\"$git_repo_name\"}"
 TMP_DIR=$(mktemp -d)
 cd "$TMP_DIR"
-git clone "http://nephio:secret@localhost:3000/nephio/$git_repo_name.git"
+git clone "http://nephio:secret@${gitea_ip}:3000/nephio/$git_repo_name.git"
 cd "$git_repo_name"
 if ! git rev-parse -q --verify refs/remotes/origin/main >/dev/null; then
   echo "Add main branch to git repo:"
@@ -100,15 +86,15 @@ cd "${git_root}"
 rm -fr "$TMP_DIR"
 
 test_git_repo_name="test-blueprints"
-curl -v -k -H "content-type: application/json" "http://nephio:secret@localhost:3000/api/v1/user/repos" --data "{\"name\":\"$test_git_repo_name\"}"
+curl -v -k -H "content-type: application/json" "http://nephio:secret@${gitea_ip}:3000/api/v1/user/repos" --data "{\"name\":\"$test_git_repo_name\"}"
 TMP_DIR=$(mktemp -d)
 cd "$TMP_DIR"
 git clone "${git_root}/test/pkgs/test-pkgs/test-blueprints.bundle" -b main
 cd "$test_git_repo_name"
 
 git gc
 git remote rename origin upstream
-git remote add origin "http://nephio:secret@localhost:3000/nephio/$test_git_repo_name"
+git remote add origin "http://nephio:secret@${gitea_ip}:3000/nephio/$test_git_repo_name"
 git push -u origin --all
 git push -u origin --tags
 

scripts/install-dev-gitea-setup.sh

@@ -20,8 +20,6 @@ set -o pipefail # Check errors in piped commands
 self_dir="$(dirname "$(readlink -f "$0")")"
 
 porch_cluster_name=${PORCH_TEST_CLUSTER:-porch-test}
-git_repo_name="$porch_cluster_name"
-gitea_ip=172.18.255.200  # should be from the address range in deployments/local/metallb-conf.yaml
 
 git_root="$(readlink -f "${self_dir}/..")"
 cd "${git_root}"
@@ -60,18 +58,24 @@ kind export kubeconfig --name="$porch_cluster_name"
 
 ##############################################
 h1 Install MetalLB
-kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.14.9/config/manifests/metallb-native.yaml
-sleep 1
-echo "Waiting for controller to become ready..."
-kubectl wait --namespace metallb-system deploy controller \
-                --for=condition=available \
-                --timeout=90s
-kubectl apply -f "${git_root}/deployments/local/metallb-conf.yaml"
+if ! kubectl get namespace metallb-system >/dev/null 2>&1; then
+  kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.14.9/config/manifests/metallb-native.yaml
+  sleep 1
+  echo "Waiting for controller to become ready..."
+  kubectl wait --namespace metallb-system deploy controller \
+                  --for=condition=available \
+                  --timeout=90s
+  kubectl apply -f "${git_root}/deployments/local/metallb-conf.yaml"
+else
+  echo "MetalLB already installed"
+fi
 
 ############################################
 # Install gitea and setup test repos
 cd "${git_root}"
-./scripts/install-dev-gitea-setup.sh $git_repo_name $gitea_ip 
+# Extract first IP from MetalLB address range
+gitea_ip=$(grep -A1 "addresses:" "${git_root}/deployments/local/metallb-conf.yaml" | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+" | head -1)
+./scripts/install-dev-gitea-setup.sh $porch_cluster_name $gitea_ip 
 
 ############################################
 h1 Generate certs and keys

scripts/setup-dev-env.sh

@@ -164,12 +164,13 @@ spec:
             timeoutSeconds: 1
           readinessProbe:
             failureThreshold: 3
-            initialDelaySeconds: 5
+            initialDelaySeconds: 30
             periodSeconds: 10
             successThreshold: 1
-            tcpSocket:
+            httpGet:
+              path: /api/v1/version
               port: http
-            timeoutSeconds: 1
+            timeoutSeconds: 5
           resources: {}
           securityContext: {}
           volumeMounts:

test/pkgs/gitea-dev/deployment.yaml

@@ -18,6 +18,7 @@ spec:
   - name: http
     port: 3000
     targetPort: 3000
+    nodePort: 30000 # Should match the gitea nodes.extraPortMappings.containerPort on the Kind cluster
   selector:
     app.kubernetes.io/name: gitea
     app.kubernetes.io/instance: gitea