Merge pull request #5245 from thomasferrandiz/issue-5231_release-1.27

[release-1.27] update rke2-whereabouts to v0.6.3 and bump rke2-multus parent chart
rancher · Jan 12, 2024 · d7dfd35 · d7dfd35
2 parents 75075f2 + a722609
commit d7dfd35
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -20,7 +20,7 @@ charts:
   - version: 2.11.100-build2023051511
     filename: /charts/rke2-metrics-server.yaml
     bootstrap: false
-  - version: v4.0.2-build2023081106
+  - version: v4.0.2-build2023081107
     filename: /charts/rke2-multus.yaml
     bootstrap: true
   - version: 1.5.100

diff --git a/scripts/build-images b/scripts/build-images
@@ -82,7 +82,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
     ${REGISTRY}/rancher/hardened-ib-sriov-cni:v1.0.2-build20231009
     ${REGISTRY}/rancher/hardened-sriov-network-resources-injector:v1.5-build20231009
     ${REGISTRY}/rancher/hardened-sriov-network-webhook:v1.2.0-build20230607
-    ${REGISTRY}/rancher/hardened-whereabouts:v0.6.2-build20231009
+    ${REGISTRY}/rancher/hardened-whereabouts:v0.6.3-build20240109
     ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
 EOF
 

diff --git a/scripts/validate-charts b/scripts/validate-charts
@@ -51,7 +51,7 @@ check_system_registry() {
     chart_tmp=$3
 
     yaml_tmp=$(mktemp --suffix .yaml)
-    values="global.systemDefaultRegistry=my-registry,global.cattle.systemDefaultRegistry=my-registry,vCenter.clusterId=test-id"
+    values="global.systemDefaultRegistry=my-registry,global.cattle.systemDefaultRegistry=my-registry,vCenter.clusterId=test-id,rke2-whereabouts.enabled=true"
     helm template test-chart --kube-version ${KUBERNETES_VERSION} --set $values $chart_tmp > $yaml_tmp;
 
     awk '$1 ~ /^image:/ {
@@ -110,7 +110,7 @@ check_airgap() {
     chart_tmp=$3
 
     yaml_tmp=$(mktemp --suffix .yaml)
-    values="vCenter.clusterId=test-id"
+    values="vCenter.clusterId=test-id,rke2-whereabouts.enabled=true"
     helm template test-chart --kube-version ${KUBERNETES_VERSION} --set $values $chart_tmp > $yaml_tmp;
 
     chart_folder=$(mktemp -d)