add Makefile cluster

pli01 · Mar 11, 2024 · be66f51 · be66f51
1 parent 1edbaeb
commit be66f51
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -34,7 +34,7 @@ jobs:
 
       - name: "Create local kubernetes ${{ matrix.k8s }} cluster"
         run: |
-          kind create cluster -n local-${{ matrix.k8s }} --config ci/kind/local.yaml  --image=kindest/node:${{ matrix.k8s }}
+          make ci-bootstrap-local-cluster K8S_VERSION=${{ matrix.k8s }}
           kubectl get nodes -A
 
       - name: Test on local environment
@@ -53,5 +53,5 @@ jobs:
       - name: Teardown
         if: always()
         run: |
-          echo "Destroy cluster"
-          kind delete clusters -A
+          echo "Destroy cluster ${{ matrix.k8s }}"
+          make ci-delete-local-cluster K8S_VERSION=${{ matrix.k8s }}
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 HELMFILE_ENVIRONMENT := local
+K8S_VERSION=v1.29.2
 
 lint: repos
 	@helmfile -e $(HELMFILE_ENVIRONMENT) lint
@@ -21,4 +22,8 @@ local-root-ca:
 	./scripts/local-ca-root-issuer.sh
 
 ci-local-tests:
-	@./ci/tests//test-local-url.sh
+	@./ci/tests/test-local-url.sh
+ci-bootstrap-local-cluster:
+	kind create cluster -n local-$(K8S_VERSION) --config ci/kind/local.yaml  --image=kindest/node:$(K8S_VERSION)
+ci-delete-local-cluster:
+	kind delete cluster -n local-$(K8S_VERSION)
diff --git a/helmfile.d/environments/local.yaml b/helmfile.d/environments/local.yaml
@@ -57,6 +57,9 @@ prometheus:
   ingress_namespace: ingress-nginx
   ingress_name: ingress-nginx
 
+argocd:
+  installed: true
+
 whoami:
   installed: true
   ingress_class: nginx
@@ -80,6 +83,3 @@ whoami:
 #    nginx.ingress.kubernetes.io/auth-secret: ingress-nginx/basic-auth
 #    nginx.ingress.kubernetes.io/auth-secret-type: auth-file
 #    nginx.ingress.kubernetes.io/auth-realm: "Progress Authentication"
-
-argocd:
-  installed: true