update rke2-metric-server to fix busybox image

rancher · Jan 5, 2024 · 601f603 · 601f603
1 parent b8007b6
commit 601f603
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -17,7 +17,7 @@ charts:
   - version: 4.8.200
     filename: /charts/rke2-ingress-nginx.yaml
     bootstrap: false
-  - version: 2.11.100-build2023051511
+  - version: 2.11.100-build2023051513
     filename: /charts/rke2-metrics-server.yaml
     bootstrap: false
   - version: v4.0.2-build2023081106

diff --git a/scripts/build-images b/scripts/build-images
@@ -26,6 +26,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION}
     ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v6.2.1
     ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-validation-webhook:v6.2.2
+    ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt

diff --git a/scripts/validate-charts b/scripts/validate-charts
@@ -55,7 +55,7 @@ check_system_registry() {
     helm template test-chart --kube-version ${KUBERNETES_VERSION} --set $values $chart_tmp > $yaml_tmp;
 
     awk '$1 ~ /^image:/ {
-        if( $2 !~ /my-registry/ && $2 !~ busybox) {
+        if( $2 !~ /my-registry/ ) {
             print $2
         }
     }
@@ -141,7 +141,6 @@ check_airgap() {
     ' $yaml_tmp | \
     while read image
     do
-        [ "$image" = "busybox" ] && continue
         if ! grep -q $image scripts/build-images; then
             echo $image
         fi