Update Calico to v3.27.0

Signed-off-by: Roberto Bonafiglia <[email protected]>
rancher · Feb 9, 2024 · ad1ddf8 · ad1ddf8
1 parent f32278c
commit ad1ddf8
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 17 deletions.
diff --git a/packages/rke2-calico/charts-crd/Chart.yaml b/packages/rke2-calico/charts-crd/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+version: v3.27.0
+description: Installs the CRDs for rke2-calico
+name: rke2-calico-crd
+type: application
diff --git a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch
@@ -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
diff --git a/packages/rke2-calico/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rke2-calico/generated-changes/patch/templates/_helpers.tpl.patch
@@ -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 -}}
+
+ {{/*
diff --git a/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch b/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch
@@ -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 }}

diff --git a/...e2-calico/generated-changes/patch/templates/tigera-operator/01-imagepullsecret.yaml.patch b/...e2-calico/generated-changes/patch/templates/tigera-operator/01-imagepullsecret.yaml.patch
@@ -5,7 +5,7 @@
  {{- $envAll := . }}
  {{- if .Values.imagePullSecrets }}
 
-@@ -7,7 +6,7 @@
+@@ -8,7 +7,7 @@
  kind: Secret
  metadata:
    name: {{ $key }}

diff --git a/...ated-changes/patch/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml.patch b/...ated-changes/patch/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml.patch
@@ -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 }}
diff --git a/...e2-calico/generated-changes/patch/templates/tigera-operator/02-tigera-operator.yaml.patch b/...e2-calico/generated-changes/patch/templates/tigera-operator/02-tigera-operator.yaml.patch
@@ -9,7 +9,7 @@
    labels:
      k8s-app: tigera-operator
  spec:
-@@ -37,7 +37,7 @@
+@@ -40,7 +40,7 @@
        dnsPolicy: ClusterFirstWithHostNet
        containers:
          - name: tigera-operator

diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -1,11 +1,24 @@
+@@ -6,8 +6,21 @@
  imagePullSecrets: {}
 
  installation:
@@ -13,32 +13,39 @@
 +    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
 +  enabled: false
 
  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: ""

diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml
@@ -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

diff --git a/packages/rke2-calico/templates/crd-template/Chart.yaml b/packages/rke2-calico/templates/crd-template/Chart.yaml
@@ -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