From e8b65ae7ef72c0cc82b63d5ae1bab9ffa8646d61 Mon Sep 17 00:00:00 2001
From: Alex Chapellon <alexandre.Chapellon@hyland.com>
Date: Mon, 18 Sep 2023 17:26:34 +0200
Subject: [PATCH] OPSEXP-2242: better control of ingress version in setup kind
 action (#326)

Co-authored-by: Anahide Tchertchian <608958+atchertchian@users.noreply.github.com>
---
 .github/actions/setup-kind/action.yml | 13 ++++++++++---
 docs/README.md                        |  5 ++++-
 version.txt                           |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/actions/setup-kind/action.yml b/.github/actions/setup-kind/action.yml
index b39cc007d..a9a2a1852 100644
--- a/.github/actions/setup-kind/action.yml
+++ b/.github/actions/setup-kind/action.yml
@@ -8,6 +8,13 @@ inputs:
       https://github.com/kubernetes-sigs/kind/releases
     required: true
     default: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
+  ingress-nginx-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:
@@ -20,10 +27,10 @@ runs:
     - name: Install ingress-nginx
       shell: bash
       env:
-        NGINX_MANIFEST: |
-          https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+        NGINX_MANIFEST_URL: >-
+          https://raw.githubusercontent.com/kubernetes/ingress-nginx/${{ inputs.ingress-nginx-ref }}/deploy/static/provider/kind/deploy.yaml
       run: |
-        kubectl apply -f $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
index 80769166f..0c1c7644d 100644
--- 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
+          ingress-nginx-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 `ingress-nginx-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
diff --git a/version.txt b/version.txt
index 040943e56..b299be978 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v3.2.1
+v3.3.0