Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/chart_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ charts:
- version: 1.46.201
filename: /charts/rke2-coredns.yaml
bootstrap: true
- version: 4.15.107
- version: 4.15.108
filename: /charts/rke2-ingress-nginx.yaml
bootstrap: false
- version: 41.1.101
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-images
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PULL_CMD="${PULL_CMD:-echo}"
PULL_CMD_CORE="${PULL_CMD_CORE:-docker image pull --quiet}"

INGRESS_NGINX_HARDENED_TAG=v1.14.5-hardened2
INGRESS_NGINX_PRIME_TAG=v1.15.1-prime9
INGRESS_NGINX_PRIME_TAG=v1.15.1-prime10
INGRESS_NGINX_IMAGES="
${REGISTRY}/rancher/kube-webhook-certgen:${INGRESS_NGINX_HARDENED_TAG}
${REGISTRY}/rancher/nginx-ingress-controller:${INGRESS_NGINX_HARDENED_TAG}"
Expand Down
8 changes: 7 additions & 1 deletion updatecli/updatecli.d/ingress-nginx-prime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@ conditions:
# the wrong chart.
key: '$.charts[5].filename'
value: /charts/rke2-ingress-nginx.yaml
verifyPrimeInChartValues:
primeRequiresChartBump:
name: "Only update the prime image when the chart is updated"
kind: "shell"
sourceid: prime
spec:
command: bash ./updatecli/scripts/validate_version.sh rke2-ingress-nginx '{{ source "chart" }}'
verifyPrimeInChartValues:
name: "Verify prime image is contained in the source chart's values.yaml"
kind: "helmchart"
disablesourceinput: true
Expand Down
Loading