rke2-whereabouts: fix gloablSystemRegistry and securityContext

packages/rke2-multus/package.yaml

@@ -1,3 +1,3 @@
 url: local
 workingDir: charts
-packageVersion: 07
+packageVersion: 08

packages/rke2-whereabouts/charts/templates/_helpers.tpl

@@ -73,3 +73,11 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}

packages/rke2-whereabouts/charts/templates/daemonset.yaml

@@ -42,9 +42,8 @@ spec:
               SLEEP=false /install-cni.sh &&
               /ip-control-loop -log-level debug
           securityContext:
-            # {{- toYaml .Values.securityContext | nindent 12 }}
-            privileged: true
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ template "system_default_registry" . }}{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: NODENAME

packages/rke2-whereabouts/charts/values.yaml

@@ -45,3 +45,6 @@ tolerations:
     effect: NoSchedule
 
 affinity: {}
+
+global:
+  systemDefaultRegistry: ""

packages/rke2-whereabouts/package.yaml

@@ -1,5 +1,5 @@
 url: local
 workingDir: charts
-packageVersion: 00
+packageVersion: 01
 # whereabouts is only used as a dependency of multus
 doNotRelease: true