mirror of https://git.rancher.io/rke2-charts
Update Calico to v3.27.0
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>pull/408/head
Roberto Bonafiglia
Roberto Bonafiglia
parent
f32278cdb8
commit
ad1ddf830a
|
|
@ -0,0 +1,5 @@
|
|||
apiVersion: v1
|
||||
version: v3.27.0
|
||||
description: Installs the CRDs for rke2-calico
|
||||
name: rke2-calico-crd
|
||||
type: application
|
||||
|
|
@ -10,6 +10,6 @@
|
|||
- https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator
|
||||
- https://github.com/tigera/operator
|
||||
- https://github.com/projectcalico/calico
|
||||
version: v3.26.3
|
||||
version: v3.27.0
|
||||
+annotations:
|
||||
+ catalog.cattle.io/namespace: tigera-operator
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- charts-original/templates/_helpers.tpl
|
||||
+++ charts/templates/_helpers.tpl
|
||||
@@ -1,7 +1,10 @@
|
||||
@@ -1,9 +1,12 @@
|
||||
{{/* generate the image name for a component*/}}
|
||||
{{- define "tigera-operator.image" -}}
|
||||
-{{- if .registry -}}
|
||||
|
|
@ -14,3 +14,5 @@
|
|||
+{{- end -}}
|
||||
+{{- .Values.tigeraOperator.image -}}:{{- .Values.tigeraOperator.version -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
--- charts-original/templates/crs/custom-resources.yaml
|
||||
+++ charts/templates/crs/custom-resources.yaml
|
||||
@@ -6,6 +6,33 @@
|
||||
{{ $secrets = append $secrets $item }}
|
||||
{{ end }}
|
||||
{{ $_ := set $installSpec "imagePullSecrets" $secrets }}
|
||||
@@ -2,6 +2,33 @@
|
||||
{{ $installSpec := omit .Values.installation "enabled" }}
|
||||
{{ $_ := set $installSpec "imagePullSecrets" (include "tigera-operator.imagePullSecrets" . | fromYamlArray) }}
|
||||
{{ $_ := set $installSpec "kubeletVolumePluginPath" .Values.kubeletVolumePluginPath }}
|
||||
+{{ $defaultRegistry := get $installSpec "registry" }}
|
||||
+{{ $finalRegistry := coalesce .Values.global.systemDefaultRegistry $defaultRegistry }}
|
||||
+{{ $_ := set $installSpec "registry" $finalRegistry }}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
{{- $envAll := . }}
|
||||
{{- if .Values.imagePullSecrets }}
|
||||
|
||||
@@ -7,7 +6,7 @@
|
||||
@@ -8,7 +7,7 @@
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ $key }}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
--- charts-original/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml
|
||||
+++ charts/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml
|
||||
@@ -8,5 +8,5 @@
|
||||
@@ -2,5 +2,5 @@
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: tigera-operator
|
||||
- namespace: {{.Release.Namespace}}
|
||||
+ namespace: tigera-operator
|
||||
imagePullSecrets: {{- $secrets | toYaml | nindent 2 }}
|
||||
imagePullSecrets: {{- include "tigera-operator.imagePullSecrets" . | nindent 2 }}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
labels:
|
||||
k8s-app: tigera-operator
|
||||
spec:
|
||||
@@ -37,7 +37,7 @@
|
||||
@@ -40,7 +40,7 @@
|
||||
dnsPolicy: ClusterFirstWithHostNet
|
||||
containers:
|
||||
- name: tigera-operator
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- charts-original/values.yaml
|
||||
+++ charts/values.yaml
|
||||
@@ -1,11 +1,24 @@
|
||||
@@ -6,8 +6,21 @@
|
||||
imagePullSecrets: {}
|
||||
|
||||
installation:
|
||||
|
|
@ -13,12 +13,17 @@
|
|||
+ effect: "NoExecute"
|
||||
enabled: true
|
||||
+ kubeletVolumePluginPath: "None"
|
||||
kubernetesProvider: ''
|
||||
kubernetesProvider: ""
|
||||
+ calicoNetwork:
|
||||
+ bgp: Disabled
|
||||
+ imagePath: "rancher"
|
||||
+ imagePrefix: "mirrored-calico-"
|
||||
+ flexVolumePath: "/var/lib/kubelet/volumeplugins/"
|
||||
# imagePullSecrets are configured on all images deployed by the tigera-operator.
|
||||
# secrets specified here must exist in the tigera-operator namespace; they won't be created by the operator or helm.
|
||||
# imagePullSecrets are a slice of LocalObjectReferences, which is the same format they appear as on deployments.
|
||||
@@ -16,7 +29,7 @@
|
||||
imagePullSecrets: []
|
||||
|
||||
apiServer:
|
||||
- enabled: true
|
||||
|
|
@ -26,19 +31,21 @@
|
|||
|
||||
certs:
|
||||
node:
|
||||
@@ -40,9 +53,28 @@
|
||||
@@ -51,11 +64,30 @@
|
||||
|
||||
# Image and registry configuration for the tigera/operator pod.
|
||||
tigeraOperator:
|
||||
- image: tigera/operator
|
||||
+ image: rancher/mirrored-calico-operator
|
||||
version: v1.30.7
|
||||
version: v1.32.3
|
||||
- registry: quay.io
|
||||
+ registry: docker.io
|
||||
calicoctl:
|
||||
- image: docker.io/calico/ctl
|
||||
+ image: rancher/mirrored-calico-ctl
|
||||
tag: v3.26.3
|
||||
tag: v3.27.0
|
||||
|
||||
kubeletVolumePluginPath: /var/lib/kubelet
|
||||
+
|
||||
+global:
|
||||
+ systemDefaultRegistry: ""
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
url: https://github.com/projectcalico/calico/releases/download/v3.26.3/tigera-operator-v3.26.3.tgz
|
||||
url: https://github.com/projectcalico/calico/releases/download/v3.27.0/tigera-operator-v3.27.0.tgz
|
||||
packageVersion: 00
|
||||
additionalCharts:
|
||||
- workingDir: charts-crd
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
apiVersion: v1
|
||||
version: v3.26.3
|
||||
version: v3.27.0
|
||||
description: Installs the CRDs for rke2-calico
|
||||
name: rke2-calico-crd
|
||||
type: application
|
||||
|
|
|
|||
Loading…
Reference in New Issue