From a1b89b65a74cc83c3fcc71fc06875512ea675b46 Mon Sep 17 00:00:00 2001 From: tuti Date: Fri, 16 Feb 2024 16:17:05 -0800 Subject: [PATCH 1/2] Automatic version updates for v1.32.5 release --- config/calico_versions.yml | 24 ++++++------- config/common_versions.yml | 4 +-- pkg/components/calico.go | 36 +++++++++---------- pkg/components/common.go | 2 +- ...projectcalico.org_felixconfigurations.yaml | 7 ++++ 5 files changed, 40 insertions(+), 33 deletions(-) diff --git a/config/calico_versions.yml b/config/calico_versions.yml index 528d9888b9..1895b959f3 100644 --- a/config/calico_versions.yml +++ b/config/calico_versions.yml @@ -1,25 +1,25 @@ # Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl -title: v3.27.0 +title: v3.27.1 components: libcalico-go: - version: v3.27.0 + version: v3.27.1 typha: - version: v3.27.0 + version: v3.27.1 calico/node: - version: v3.27.0 + version: v3.27.1 calico/cni: - version: v3.27.0 + version: v3.27.1 calico/node-windows: - version: v3.27.0 + version: v3.27.1 calico/cni-windows: - version: v3.27.0 + version: v3.27.1 calico/kube-controllers: - version: v3.27.0 + version: v3.27.1 flexvol: - version: v3.27.0 + version: v3.27.1 calico/apiserver: - version: v3.27.0 + version: v3.27.1 calico/csi: - version: v3.27.0 + version: v3.27.1 csi-node-driver-registrar: - version: v3.27.0 + version: v3.27.1 diff --git a/config/common_versions.yml b/config/common_versions.yml index 234cc1f580..3b866e78f7 100644 --- a/config/common_versions.yml +++ b/config/common_versions.yml @@ -1,5 +1,5 @@ -title: v1.1.17 +title: v1.1.18 components: key-cert-provisioner: image: tigera/key-cert-provisioner - version: v1.1.17 + version: v1.1.18 diff --git a/pkg/components/calico.go b/pkg/components/calico.go index cdd3c600e6..38e1e764d7 100644 --- a/pkg/components/calico.go +++ b/pkg/components/calico.go @@ -20,106 +20,106 @@ package components import "github.com/tigera/operator/version" var ( - CalicoRelease string = "v3.27.0" + CalicoRelease string = "v3.27.1" ComponentCalicoCNI = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/cni", Registry: "", } ComponentCalicoCNIFIPS = component{ - Version: "v3.27.0-fips", + Version: "v3.27.1-fips", Image: "calico/cni", Registry: "", } ComponentCalicoCNIWindows = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/cni-windows", Registry: "", } ComponentCalicoKubeControllers = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/kube-controllers", Registry: "", } ComponentCalicoKubeControllersFIPS = component{ - Version: "v3.27.0-fips", + Version: "v3.27.1-fips", Image: "calico/kube-controllers", Registry: "", } ComponentCalicoNode = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/node", Registry: "", } ComponentCalicoNodeFIPS = component{ - Version: "v3.27.0-fips", + Version: "v3.27.1-fips", Image: "calico/node", Registry: "", } ComponentCalicoNodeWindows = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/node-windows", Registry: "", } ComponentCalicoTypha = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/typha", Registry: "", } ComponentCalicoTyphaFIPS = component{ - Version: "v3.27.0-fips", + Version: "v3.27.1-fips", Image: "calico/typha", Registry: "", } ComponentFlexVolume = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/pod2daemon-flexvol", Registry: "", } ComponentCalicoAPIServer = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/apiserver", Registry: "", } ComponentCalicoAPIServerFIPS = component{ - Version: "v3.27.0-fips", + Version: "v3.27.1-fips", Image: "calico/apiserver", Registry: "", } ComponentCalicoCSI = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/csi", Registry: "", } ComponentCalicoCSIFIPS = component{ - Version: "v3.27.0-fips", + Version: "v3.27.1-fips", Image: "calico/csi", Registry: "", } ComponentCalicoCSIRegistrar = component{ - Version: "v3.27.0", + Version: "v3.27.1", Image: "calico/node-driver-registrar", Registry: "", } ComponentCalicoCSIRegistrarFIPS = component{ - Version: "v3.27.0-fips", + Version: "v3.27.1-fips", Image: "calico/node-driver-registrar", Registry: "", } diff --git a/pkg/components/common.go b/pkg/components/common.go index ac856d303c..d91608ba9a 100644 --- a/pkg/components/common.go +++ b/pkg/components/common.go @@ -16,7 +16,7 @@ package components var ( ComponentCSRInitContainer = component{ - Version: "v1.1.17", + Version: "v1.1.18", Image: "tigera/key-cert-provisioner", Registry: "", } diff --git a/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml b/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml index c7cbeea686..860998fcf0 100644 --- a/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml +++ b/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml @@ -118,6 +118,13 @@ spec: Loose]' pattern: ^(?i)(Disabled|Strict|Loose)?$ type: string + bpfExcludeCIDRsFromNAT: + description: BPFExcludeCIDRsFromNAT is a list of CIDRs that are to + be excluded from NAT resolution so that host can handle them. A + typical usecase is node local DNS cache. + items: + type: string + type: array bpfExtToServiceConnmark: description: 'BPFExtToServiceConnmark in BPF mode, control a 32bit mark that is set on connections from an external client to a local From 9a252f192eb67a5aba2cfffe4087fd0022fe141b Mon Sep 17 00:00:00 2001 From: tuti Date: Fri, 16 Feb 2024 17:28:54 -0800 Subject: [PATCH 2/2] 3.27.1 -> 3.27.2 --- config/calico_versions.yml | 24 ++++++++++++------------ pkg/components/calico.go | 36 ++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/config/calico_versions.yml b/config/calico_versions.yml index 1895b959f3..258075a8b1 100644 --- a/config/calico_versions.yml +++ b/config/calico_versions.yml @@ -1,25 +1,25 @@ # Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl -title: v3.27.1 +title: v3.27.2 components: libcalico-go: - version: v3.27.1 + version: v3.27.2 typha: - version: v3.27.1 + version: v3.27.2 calico/node: - version: v3.27.1 + version: v3.27.2 calico/cni: - version: v3.27.1 + version: v3.27.2 calico/node-windows: - version: v3.27.1 + version: v3.27.2 calico/cni-windows: - version: v3.27.1 + version: v3.27.2 calico/kube-controllers: - version: v3.27.1 + version: v3.27.2 flexvol: - version: v3.27.1 + version: v3.27.2 calico/apiserver: - version: v3.27.1 + version: v3.27.2 calico/csi: - version: v3.27.1 + version: v3.27.2 csi-node-driver-registrar: - version: v3.27.1 + version: v3.27.2 diff --git a/pkg/components/calico.go b/pkg/components/calico.go index 38e1e764d7..56caf7593a 100644 --- a/pkg/components/calico.go +++ b/pkg/components/calico.go @@ -20,106 +20,106 @@ package components import "github.com/tigera/operator/version" var ( - CalicoRelease string = "v3.27.1" + CalicoRelease string = "v3.27.2" ComponentCalicoCNI = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/cni", Registry: "", } ComponentCalicoCNIFIPS = component{ - Version: "v3.27.1-fips", + Version: "v3.27.2-fips", Image: "calico/cni", Registry: "", } ComponentCalicoCNIWindows = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/cni-windows", Registry: "", } ComponentCalicoKubeControllers = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/kube-controllers", Registry: "", } ComponentCalicoKubeControllersFIPS = component{ - Version: "v3.27.1-fips", + Version: "v3.27.2-fips", Image: "calico/kube-controllers", Registry: "", } ComponentCalicoNode = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/node", Registry: "", } ComponentCalicoNodeFIPS = component{ - Version: "v3.27.1-fips", + Version: "v3.27.2-fips", Image: "calico/node", Registry: "", } ComponentCalicoNodeWindows = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/node-windows", Registry: "", } ComponentCalicoTypha = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/typha", Registry: "", } ComponentCalicoTyphaFIPS = component{ - Version: "v3.27.1-fips", + Version: "v3.27.2-fips", Image: "calico/typha", Registry: "", } ComponentFlexVolume = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/pod2daemon-flexvol", Registry: "", } ComponentCalicoAPIServer = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/apiserver", Registry: "", } ComponentCalicoAPIServerFIPS = component{ - Version: "v3.27.1-fips", + Version: "v3.27.2-fips", Image: "calico/apiserver", Registry: "", } ComponentCalicoCSI = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/csi", Registry: "", } ComponentCalicoCSIFIPS = component{ - Version: "v3.27.1-fips", + Version: "v3.27.2-fips", Image: "calico/csi", Registry: "", } ComponentCalicoCSIRegistrar = component{ - Version: "v3.27.1", + Version: "v3.27.2", Image: "calico/node-driver-registrar", Registry: "", } ComponentCalicoCSIRegistrarFIPS = component{ - Version: "v3.27.1-fips", + Version: "v3.27.2-fips", Image: "calico/node-driver-registrar", Registry: "", }