add a param to set the ingress version to deploy with Kind clusters

Alfresco · Sep 18, 2023 · 74256d0 · 74256d0
1 parent 713b4ba
commit 74256d0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/actions/setup-kind/action.yml b/.github/actions/setup-kind/action.yml
@@ -8,10 +8,13 @@ inputs:
       https://github.com/kubernetes-sigs/kind/releases
     required: true
     default: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
-  nginx-manifest:
-    description: The nginx manifest to apply.
-    required: true
-    default: https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+  nginx-ingress-ref:
+    description: |
+      the Nginx ingress ref to get the ingress congtroller deployment manifest from
+      (https://github.com/kubernetes/ingress-nginx). Consider main (the default) a floating tag which can result in
+      deploying any version (including betas) and non repeatable builds.
+    required: false
+    default: main
 runs:
   using: "composite"
   steps:
@@ -23,8 +26,11 @@ runs:
 
     - name: Install ingress-nginx
       shell: bash
+      env:
+        NGINX_MANIFEST_URL: >-
+          https://raw.githubusercontent.com/kubernetes/ingress-nginx/${{ inputs.nginx-ingress-ref }}/deploy/static/provider/kind/deploy.yaml
       run: |
-        kubectl apply -f ${{ inputs.nginx-manifest }}
+        kubectl apply -f "${NGINX_MANIFEST_URL}"
 
     - name: Wait for ingress ready
       shell: bash

diff --git a/docs/README.md b/docs/README.md
@@ -1176,15 +1176,18 @@ Spin up a local kubernetes cluster with nginx ingress exposing http/https ports.
 ```yaml
       - name: Setup cluster
         uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@ref
-        # with:
+        with:
           # See the available refs in the kind release notes at https://github.com/kubernetes-sigs/kind/releases
           # kind-node-image: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
+          nginx-ingress-ref: controller-v1.8.2
       - name: Helm deploy
         run: |
           helm dep up ./helm/chart
           helm install acs ./helm/chart
 ```
 
+> Although not required we recommend setting the `nginx-ingress-ref``to ensure repeatable builds
+
 ### update-project-base-tag
 
 Used to update a base tag in the release descriptor. It will add or update the