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 #316 from thomasferrandiz/update-wh-v0.6 

Update multus and whereabouts
pull/317/head
thomasferrandiz 2023-01-10 10:32:00 +01:00 committed by GitHub
parent 199d68453c b4801592e0
commit c3b61e8b82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 111 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/rke2-multus/generated-changes/patch/Chart.yaml.patch
View File

@ -3,7 +3,7 @@
@@ -1,16 +1,17 @@
apiVersion: v2
-appVersion: 0.1.0
+appVersion: 3.9
+appVersion: 3.9.3
dependencies:
- condition: rke2-whereabouts.enabled
name: rke2-whereabouts
@ -23,4 +23,4 @@
- https://github.com/intel/multus-cni
type: application
-version: 0.1.2
+version: v3.9-build20221028
+version: v3.9.3-build20230109

2
packages/rke2-multus/generated-changes/patch/values.yaml.patch
View File

@ -7,7 +7,7 @@
- repository: ghcr.io/k8snetworkplumbingwg/multus-cni
- tag: v3.8
+ repository: rancher/hardened-multus-cni
+ tag: v3.9-build20221028
+ tag: v3.9.3-build20230109
pullPolicy: IfNotPresent
#imagePullSecrets: []

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

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

57
packages/rke2-whereabouts/generated-changes/exclude/templates/cronjob.yaml Normal file
View File

@ -0,0 +1,57 @@
apiVersion: batch/v1beta1
kind: CronJob
metadata:
name: {{ include "whereabouts.fullname" . }}
{{- include "whereabouts.namespace" . | nindent 2 }}
labels:
{{- include "whereabouts.labels" . | nindent 4 }}
spec:
concurrencyPolicy: Forbid
successfulJobsHistoryLimit: {{ .Values.successfulJobsHistoryLimit | default "0" }}
schedule: "*/5 * * * *"
jobTemplate:
spec:
backoffLimit: 0
template:
metadata:
labels:
name: whereabouts
{{- include "whereabouts.selectorLabels" . | nindent 12 }}
spec:
priorityClassName: "system-node-critical"
serviceAccountName: {{ include "whereabouts.serviceAccountName" . }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 12 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 16 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{- toYaml .Values.resources | nindent 16 }}
command:
- /ip-reconciler
- -log-level=verbose
volumeMounts:
- name: cni-net-dir
mountPath: /host/etc/cni/net.d
volumes:
- name: cni-net-dir
hostPath:
path: /etc/cni/net.d
restartPolicy: OnFailure
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 12 }}
{{- end }}

18
packages/rke2-whereabouts/generated-changes/patch/templates/_helpers.tpl.patch Normal file
View File

@ -0,0 +1,18 @@
--- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl
@@ -1,4 +1,15 @@
{{/*
+Support private registry.
+*/}}
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
Expand the name of the chart.
*/}}
{{- define "whereabouts.name" -}}

8
packages/rke2-whereabouts/generated-changes/patch/templates/cronjob.yaml.patch
View File

@ -1,8 +0,0 @@
--- charts-original/templates/cronjob.yaml
+++ charts/templates/cronjob.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
kind: CronJob
metadata:
name: {{ include "whereabouts.fullname" . }}

19
packages/rke2-whereabouts/generated-changes/patch/templates/daemonset.yaml.patch Normal file
View File

@ -0,0 +1,19 @@
--- charts-original/templates/daemonset.yaml
+++ charts/templates/daemonset.yaml
@@ -32,9 +32,15 @@
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Chart.Name }}
+ command: [ "/bin/sh" ]
+ args:
+ - -c
+ - >
+ SLEEP=false /install-cni.sh &&
+ /ip-control-loop -log-level debug
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+ image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: WHEREABOUTS_NAMESPACE

14
packages/rke2-whereabouts/generated-changes/patch/values.yaml.patch
View File

@ -9,12 +9,20 @@
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
- tag: "latest-amd64"
+ tag: v0.5.3-build20221027
+ tag: v0.6-build20230109
updateStrategy: RollingUpdate
imagePullSecrets: []
@@ -41,7 +41,7 @@
memory: "50Mi"
@@ -35,13 +35,13 @@
resources:
requests:
cpu: "100m"
- memory: "50Mi"
+ memory: "100Mi"
limits:
cpu: "100m"
- memory: "50Mi"
+ memory: "100Mi"
nodeSelector:
- beta.kubernetes.io/arch: amd64

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

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