From c9d912e7917cad8d40fa6c61f73321acaeb11a3a Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Thu, 9 Feb 2023 11:18:52 +0100 Subject: [PATCH] Update Calico to v3.25.0 Signed-off-by: Roberto Bonafiglia --- .../generated-changes/patch/Chart.yaml.patch | 2 +- .../generated-changes/patch/README.md.patch | 11 ----------- ...d.projectcalico.org_felixconfigurations.yaml.patch | 4 ++-- .../operator.tigera.io_installations_crd.yaml.patch | 10 +++++----- .../02-serviceaccount-tigera-operator.yaml.patch | 3 ++- .../generated-changes/patch/values.yaml.patch | 4 ++-- packages/rke2-calico/package.yaml | 2 +- .../rke2-calico/templates/crd-template/Chart.yaml | 2 +- 8 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 packages/rke2-calico/generated-changes/patch/README.md.patch diff --git a/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch b/packages/rke2-calico/generated-changes/patch/Chart.yaml.patch index 9c43818..a0704ca 100644 --- 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.24.5 + version: v3.25.0 +annotations: + catalog.cattle.io/namespace: tigera-operator diff --git a/packages/rke2-calico/generated-changes/patch/README.md.patch b/packages/rke2-calico/generated-changes/patch/README.md.patch deleted file mode 100644 index f92686c..0000000 --- a/packages/rke2-calico/generated-changes/patch/README.md.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- charts-original/README.md -+++ charts/README.md -@@ -88,7 +88,7 @@ - - ``` - # Image pull secrets to provision for pulling images from private registries. --# This field is a map of desired Secret name to .dockerconfigjson formatted data to use for the secret. -+# If provided, references to the secrets must also be provided in the installation section. - imagePullSecrets: {} - - # Configures general installation parameters for Calico. Schema is based diff --git a/packages/rke2-calico/generated-changes/patch/crds/calico/crd.projectcalico.org_felixconfigurations.yaml.patch b/packages/rke2-calico/generated-changes/patch/crds/calico/crd.projectcalico.org_felixconfigurations.yaml.patch index 1a97787..5461f48 100644 --- a/packages/rke2-calico/generated-changes/patch/crds/calico/crd.projectcalico.org_felixconfigurations.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/crds/calico/crd.projectcalico.org_felixconfigurations.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/crds/calico/crd.projectcalico.org_felixconfigurations.yaml +++ charts/crds/calico/crd.projectcalico.org_felixconfigurations.yaml -@@ -100,11 +100,6 @@ +@@ -101,11 +101,6 @@ node appears to use the IP of the ingress node; this requires a permissive L2 network. [Default: Tunnel]' type: string @@ -12,7 +12,7 @@ bpfKubeProxyEndpointSlicesEnabled: description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls whether Felix's embedded kube-proxy accepts EndpointSlices or not. -@@ -637,8 +632,8 @@ +@@ -670,8 +665,8 @@ type: boolean vxlanEnabled: description: 'VXLANEnabled overrides whether Felix should create the diff --git a/packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_installations_crd.yaml.patch b/packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_installations_crd.yaml.patch index f00ee09..327bb8b 100644 --- a/packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_installations_crd.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/crds/operator.tigera.io_installations_crd.yaml.patch @@ -38,7 +38,7 @@ type: string kubernetesProvider: description: KubernetesProvider specifies a particular provider of -@@ -4345,10 +4330,6 @@ +@@ -4344,10 +4329,6 @@ or "OnDelete". Default is RollingUpdate. type: string type: object @@ -49,7 +49,7 @@ registry: description: "Registry is the default Docker registry used for component Docker images. If specified then the given value must end with a -@@ -10313,13 +10294,6 @@ +@@ -10312,13 +10293,6 @@ plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. type: object @@ -63,7 +63,7 @@ controlPlaneTolerations: description: ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. -@@ -10362,14 +10336,6 @@ +@@ -10361,14 +10335,6 @@ type: string type: object type: array @@ -78,7 +78,7 @@ flexVolumePath: description: FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled -@@ -10412,9 +10378,8 @@ +@@ -10411,9 +10377,8 @@ type: array kubeletVolumePluginPath: description: 'KubeletVolumePluginPath optionally specifies enablement @@ -90,7 +90,7 @@ type: string kubernetesProvider: description: KubernetesProvider specifies a particular provider -@@ -10507,10 +10472,6 @@ +@@ -10506,10 +10471,6 @@ or "OnDelete". Default is RollingUpdate. type: string type: object diff --git a/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml.patch b/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml.patch index 683300e..465c45a 100644 --- a/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml.patch @@ -1,8 +1,9 @@ --- charts-original/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml +++ charts/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml -@@ -2,4 +2,4 @@ +@@ -8,5 +8,5 @@ kind: ServiceAccount metadata: name: tigera-operator - namespace: {{.Release.Namespace}} + namespace: tigera-operator + imagePullSecrets: {{- $secrets | toYaml | nindent 2 }} diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch index 6e31aa1..10d0f89 100644 --- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch @@ -32,13 +32,13 @@ tigeraOperator: - image: tigera/operator + image: rancher/mirrored-calico-operator - version: v1.28.5 + version: v1.29.0 - registry: quay.io + registry: docker.io calicoctl: - image: docker.io/calico/ctl + image: rancher/mirrored-calico-ctl - tag: v3.24.5 + tag: v3.25.0 + +global: + systemDefaultRegistry: "" diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml index 8c1f1ea..da5178c 100644 --- 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.24.5/tigera-operator-v3.24.5.tgz +url: https://github.com/projectcalico/calico/releases/download/v3.25.0/tigera-operator-v3.25.0.tgz packageVersion: 01 additionalCharts: - workingDir: charts-crd diff --git a/packages/rke2-calico/templates/crd-template/Chart.yaml b/packages/rke2-calico/templates/crd-template/Chart.yaml index e67f9f2..bbe123c 100644 --- 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.24.5 +version: v3.25.0 description: Installs the CRDs for rke2-calico name: rke2-calico-crd type: application