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

Merge pull request #284 from mallardduck/patch-1 

Correct cilium preflight charts
pull/285/head
Manuel Buil 2022-08-31 18:14:57 +02:00 committed by GitHub
parent 91ac8d9e72 7f62087ea0
commit e0be709ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/rke2-cilium/generated-changes/patch/templates/cilium-preflight/daemonset.yaml.patch
View File

@ -5,7 +5,7 @@
initContainers: initContainers:
- name: clean-cilium-state - name: clean-cilium-state
- image: {{ include "cilium.image" .Values.preflight.image | quote }} - image: {{ include "cilium.image" .Values.preflight.image | quote }}
+ image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.preflight.image | quote }}" + image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.preflight.image }}"
imagePullPolicy: {{ .Values.preflight.image.pullPolicy }} imagePullPolicy: {{ .Values.preflight.image.pullPolicy }}
command: ["/bin/echo"] command: ["/bin/echo"]
args: args:
@ -13,7 +13,7 @@
containers: containers:
- name: cilium-pre-flight-check - name: cilium-pre-flight-check
- image: {{ include "cilium.image" .Values.preflight.image | quote }} - image: {{ include "cilium.image" .Values.preflight.image | quote }}
+ image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.preflight.image | quote }}" + image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.preflight.image }}"
imagePullPolicy: {{ .Values.preflight.image.pullPolicy }} imagePullPolicy: {{ .Values.preflight.image.pullPolicy }}
command: ["/bin/sh"] command: ["/bin/sh"]
args: args:
@ -22,7 +22,7 @@
{{- if ne .Values.preflight.tofqdnsPreCache "" }} {{- if ne .Values.preflight.tofqdnsPreCache "" }}
- name: cilium-pre-flight-fqdn-precache - name: cilium-pre-flight-fqdn-precache
- image: {{ include "cilium.image" .Values.preflight.image | quote }} - image: {{ include "cilium.image" .Values.preflight.image | quote }}
+ image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.preflight.image | quote }}" + image: "{{ template "system_default_registry" . }}{{ include "cilium.image" .Values.preflight.image }}"
imagePullPolicy: {{ .Values.preflight.image.pullPolicy }} imagePullPolicy: {{ .Values.preflight.image.pullPolicy }}
name: cilium-pre-flight-fqdn-precache name: cilium-pre-flight-fqdn-precache
command: ["/bin/sh"] command: ["/bin/sh"]

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

@ -1,2 +1,2 @@
url: https://helm.cilium.io/cilium-1.12.1.tgz url: https://helm.cilium.io/cilium-1.12.1.tgz
packageVersion: 01 packageVersion: 02