Merge pull request #2228 from caseydavenport/casey-update-v3.23.4

Update to Calico v3.23.4
tigera · Oct 20, 2022 · 1d72d3e · 1d72d3e
2 parents e2e1a40 + 58445e2
commit 1d72d3e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/config/calico_versions.yml b/config/calico_versions.yml
@@ -1,19 +1,19 @@
 # Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl
-title: v3.23.3
+title: v3.23.4
 components:
   libcalico-go:
-    version: v3.23.3
+    version: v3.23.4
   typha:
-    version: v3.23.3
+    version: v3.23.4
   calico/node:
-    version: v3.23.3
+    version: v3.23.4
   calico/cni:
-    version: v3.23.3
+    version: v3.23.4
   calico/kube-controllers:
-    version: v3.23.3
+    version: v3.23.4
   flexvol:
-    version: v3.23.3
+    version: v3.23.4
   calico/apiserver:
-    version: v3.23.3
+    version: v3.23.4
   calico/windows-upgrade:
-    version: v3.23.3
+    version: v3.23.4
diff --git a/pkg/components/calico.go b/pkg/components/calico.go
@@ -20,40 +20,40 @@ package components
 import "github.com/tigera/operator/version"
 
 var (
-	CalicoRelease string = "v3.23.3"
+	CalicoRelease string = "v3.23.4"
 
 	ComponentCalicoCNI = component{
-		Version: "v3.23.3",
+		Version: "v3.23.4",
 		Image:   "calico/cni",
 	}
 
 	ComponentCalicoKubeControllers = component{
-		Version: "v3.23.3",
+		Version: "v3.23.4",
 		Image:   "calico/kube-controllers",
 	}
 
 	ComponentCalicoNode = component{
-		Version: "v3.23.3",
+		Version: "v3.23.4",
 		Image:   "calico/node",
 	}
 
 	ComponentCalicoTypha = component{
-		Version: "v3.23.3",
+		Version: "v3.23.4",
 		Image:   "calico/typha",
 	}
 
 	ComponentFlexVolume = component{
-		Version: "v3.23.3",
+		Version: "v3.23.4",
 		Image:   "calico/pod2daemon-flexvol",
 	}
 
 	ComponentCalicoAPIServer = component{
-		Version: "v3.23.3",
+		Version: "v3.23.4",
 		Image:   "calico/apiserver",
 	}
 
 	ComponentWindowsUpgrade = component{
-		Version: "v3.23.3",
+		Version: "v3.23.4",
 		Image:   "calico/windows-upgrade",
 	}
 	ComponentOperatorInit = component{

diff --git a/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml b/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml
@@ -99,6 +99,11 @@ spec:
                   node appears to use the IP of the ingress node; this requires a
                   permissive L2 network.  [Default: Tunnel]'
                 type: string
+              bpfHostConntrackBypass:
+                description: 'BPFHostConntrackBypass Controls whether to bypass Linux
+                  conntrack in BPF mode for workloads and services. [Default: true
+                  - bypass Linux conntrack]'
+                type: boolean
               bpfKubeProxyEndpointSlicesEnabled:
                 description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls
                   whether Felix's embedded kube-proxy accepts EndpointSlices or not.
@@ -295,7 +300,6 @@ spec:
                   are auto-detected.
                 type: string
               floatingIPs:
-                default: Disabled
                 description: FloatingIPs configures whether or not Felix will program
                   floating IP addresses.
                 enum:
@@ -618,8 +622,8 @@ spec:
                 type: boolean
               vxlanEnabled:
                 description: 'VXLANEnabled overrides whether Felix should create the
-                  VXLAN tunnel device for VXLAN networking. Optional as Felix determines
-                  this based on the existing IP pools. [Default: nil (unset)]'
+                  VXLAN tunnel device for IPv4 VXLAN networking. Optional as Felix
+                  determines this based on the existing IP pools. [Default: nil (unset)]'
                 type: boolean
               vxlanMTU:
                 description: 'VXLANMTU is the MTU to set on the IPv4 VXLAN tunnel