Skip to content

Commit

Permalink
OPSEXP-2242: better control of ingress version in setup kind action (#…
Browse files Browse the repository at this point in the history
…326)

Co-authored-by: Anahide Tchertchian <[email protected]>
  • Loading branch information
alxgomz and atchertchian authored Sep 18, 2023
1 parent 3741d44 commit e8b65ae
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
13 changes: 10 additions & 3 deletions .github/actions/setup-kind/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.2.1
v3.3.0

0 comments on commit e8b65ae

Please sign in to comment.