diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch index 65eb252..de356b0 100644 --- a/packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch +++ b/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 diff --git a/packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch index 76badfd..4729d8d 100644 --- a/packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch +++ b/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: "" diff --git a/packages/rke2-metrics-server/package.yaml b/packages/rke2-metrics-server/package.yaml index 1d3a897..c97390d 100644 --- a/packages/rke2-metrics-server/package.yaml +++ b/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 diff --git a/packages/rke2-multus/charts/templates/dhcp-daemonSet.yaml b/packages/rke2-multus/charts/templates/dhcp-daemonSet.yaml index 120abe7..89b5025 100644 --- a/packages/rke2-multus/charts/templates/dhcp-daemonSet.yaml +++ b/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 diff --git a/packages/rke2-multus/charts/values.yaml b/packages/rke2-multus/charts/values.yaml index 26586d2..e301509 100755 --- a/packages/rke2-multus/charts/values.yaml +++ b/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: "" diff --git a/packages/rke2-multus/package.yaml b/packages/rke2-multus/package.yaml index 02324c4..9e7bdd9 100644 --- a/packages/rke2-multus/package.yaml +++ b/packages/rke2-multus/package.yaml @@ -1,3 +1,3 @@ url: local workingDir: charts -packageVersion: 05 +packageVersion: 06