Merge pull request #389 from thomasferrandiz/fix-busybox-rke2-metrics-server

make busybox configurable and fix registry path for multus and metrics-server

packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch

@@ -5,7 +5,7 @@
    containers:
    - name: wget
 -    image: busybox
-+    image: {{ template "system_default_registry" . }}mirrored-library-busybox:1.36.1
++    image: {{ template "system_default_registry" . }}{{ .Values.tests.image.repository }}:{{ .Values.tests.image.tag }}
      command: ['/bin/sh']
      args:
      - -c

packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch

@@ -36,7 +36,7 @@
  
  extraVolumeMounts: []
  #  - name: secrets
-@@ -101,9 +103,13 @@
+@@ -101,9 +103,18 @@
    #  kubernetes.io/name: "Metrics-server"
    port: 443
    type: ClusterIP
@@ -48,5 +48,10 @@
    minAvailable:
    maxUnavailable:
 +
++tests:
++  image:
++    repository: rancher/mirrored-library-busybox
++    tag: "1.36.1"
++
 +global:
 +  systemDefaultRegistry: ""

packages/rke2-metrics-server/package.yaml

@@ -1,3 +1,3 @@
 url: https://charts.helm.sh/stable/packages/metrics-server-2.11.1.tgz
-packageVersion: 12
+packageVersion: 13
 releaseCandidateVersion: 00

packages/rke2-multus/charts/templates/dhcp-daemonSet.yaml

@@ -27,7 +27,7 @@ spec:
       nodeSelector: {{- toYaml .Values.labels.nodeSelector | nindent 8 }}
       initContainers:
       - name: kube-{{ .Chart.Name }}-dhcp-cleanup
-        image: {{ template "system_default_registry" . }}mirrored-library-busybox:1.36.1
+        image: {{ template "system_default_registry" . }}{{ .Values.dhcpDaemonSet.image.repository }}:{{ .Values.dhcpDaemonSet.image.tag }}
         command: ["rm", "-f", "/run/cni/dhcp.sock"]
         securityContext:
           privileged: true
@@ -36,7 +36,7 @@ spec:
           mountPath: /host/run/cni
       containers:
       - name: kube-{{ .Chart.Name }}-dhcp
-        image: {{ template "system_default_registry" . }}mirrored-library-busybox:1.36.1
+        image: {{ template "system_default_registry" . }}{{ .Values.dhcpDaemonSet.image.repository }}:{{ .Values.dhcpDaemonSet.image.tag }}
         command: ["/opt/cni/bin/dhcp", "daemon"]
         securityContext:
           privileged: true

packages/rke2-multus/charts/values.yaml

@@ -125,6 +125,11 @@ cniplugins:
   # installing.
   skipcnis: flannel
 
+dhcpDaemonSet:
+  image:
+    repository: rancher/mirrored-library-busybox
+    tag: "1.36.1"
+
 global:
   systemDefaultRegistry: ""
 

packages/rke2-multus/package.yaml

@@ -1,3 +1,3 @@
 url: local
 workingDir: charts
-packageVersion: 05
+packageVersion: 06