andata
/
rke2-charts
mirror of https://git.rancher.io/rke2-charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rke2-whereabouts: fix gloablSystemRegistry and securityContext

pull/395/head
Thomas Ferrandiz 2024-01-15 15:15:46 +00:00
parent 9dad6f78bd
commit b3fec86a9f
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/rke2-multus/package.yaml
View File

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

8
packages/rke2-whereabouts/charts/templates/_helpers.tpl
View File

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

5
packages/rke2-whereabouts/charts/templates/daemonset.yaml
View File

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

3
packages/rke2-whereabouts/charts/values.yaml
View File

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

2
packages/rke2-whereabouts/package.yaml
View File

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