update multus and whereabouts charts to track upstream chart updates

Signed-off-by: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
pull/306/head
Thomas Ferrandiz 2022-12-01 17:20:41 +00:00
parent da00c467ff
commit 783abe7efe
5 changed files with 7 additions and 41 deletions

View File

@ -1,10 +0,0 @@
--- charts-original/charts/rke2-whereabouts/templates/cluster_role.yaml
+++ charts/charts/rke2-whereabouts/templates/cluster_role.yaml
@@ -7,6 +7,7 @@
- whereabouts.cni.cncf.io
resources:
- ippools
+ - overlappingrangeipreservations
verbs:
- get
- list

View File

@ -61,27 +61,3 @@
{{- if .Values.pod.resources.multus }} {{- if .Values.pod.resources.multus }}
resources: {{- toYaml .Values.pod.resources.multus | nindent 10 }} resources: {{- toYaml .Values.pod.resources.multus | nindent 10 }}
{{- end }} {{- end }}
@@ -73,9 +82,11 @@
mountPath: /host/etc/cni/net.d
- name: cnibin
mountPath: /host/opt/cni/bin
+{{- if .Values.manifests.configMap }}
- name: multus-cfg
mountPath: /tmp/multus-conf/00-multus.conf.template
subPath: "cni-conf.json"
+{{- end }}
volumes:
- name: cni
hostPath:
@@ -83,8 +94,10 @@
- name: cnibin
hostPath:
path: /opt/cni/bin
+{{- if .Values.manifests.configMap }}
- name: multus-cfg
configMap:
- name: {{ .Release.Name }}-{{ .Chart.Name }}-{{ .Chart.Version }}-config
+ name: {{ .Release.Name }}-{{ .Chart.Version }}-config
+{{- end }}
{{- end }}
{{- end }}

View File

@ -1,4 +1,4 @@
url: https://github.com/k8snetworkplumbingwg/helm-charts.git url: https://github.com/k8snetworkplumbingwg/helm-charts.git
subdirectory: multus subdirectory: multus
commit: 7d79cc653d543bf2ac5075274082e1053884b64e commit: 2f782b76912967f11694e3c44ba2e93817a0d6a2
packageVersion: 04 packageVersion: 05

View File

@ -4,16 +4,16 @@
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
image: image:
- repository: docker.io/dougbtv/whereabouts - repository: ghcr.io/k8snetworkplumbingwg/whereabouts
+ repository: rancher/hardened-whereabouts + repository: rancher/hardened-whereabouts
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
- tag: "latest" - tag: "latest-amd64"
+ tag: v0.5.3-build20221027 + tag: v0.5.3-build20221027
updateStrategy: RollingUpdate updateStrategy: RollingUpdate
imagePullSecrets: [] imagePullSecrets: []
@@ -40,7 +40,7 @@ @@ -41,7 +41,7 @@
memory: "50Mi" memory: "50Mi"
nodeSelector: nodeSelector:

View File

@ -1,6 +1,6 @@
url: https://github.com/k8snetworkplumbingwg/helm-charts.git url: https://github.com/k8snetworkplumbingwg/helm-charts.git
commit: 7d79cc653d543bf2ac5075274082e1053884b64e commit: 958588fdcb2ec0cfaaa12855cb55e3623d1a41ce
subdirectory: whereabouts subdirectory: whereabouts
packageVersion: 02 packageVersion: 03
# whereabouts is only used as a dependency of multus # whereabouts is only used as a dependency of multus
doNotRelease: true doNotRelease: true