Merge pull request #3804 from nelljerram/install-gatewayapi-crd

Allow OSS operator to self-install GatewayAPI CRD

pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml

@@ -610,6 +610,17 @@ spec:
                 description: FlowLogGoldmaneServer is the flow server endpoint to
                   which flow data should be published.
                 type: string
+              flowLogsPolicyEvaluationMode:
+                description: |-
+                  Continuous - Felix evaluates active flows on a regular basis to determine the rule
+                  traces in the flow logs. Any policy updates that impact a flow will be reflected in the
+                  pending_policies field, offering a near-real-time view of policy changes across flows.
+                  None - Felix stops evaluating pending traces.
+                  [Default: Continuous]
+                enum:
+                - None
+                - Continuous
+                type: string
               genericXDPEnabled:
                 description: |-
                   GenericXDPEnabled enables Generic XDP so network cards that don't support XDP offload or driver

pkg/crds/crds.go

@@ -53,7 +53,7 @@ var (
 func init() {
 	yamlDelimRe = regexp.MustCompile(`\n---`)
 
-	calicoCRDNames := []string{"installation", "apiserver", "imageset", "tigerastatus", "whisker", "managementclusterconnection"}
+	calicoCRDNames := []string{"installation", "apiserver", "gatewayapi", "imageset", "tigerastatus", "whisker", "managementclusterconnection"}
 	calicoOprtrCRDsRe = regexp.MustCompile(fmt.Sprintf("(%s)", strings.Join(calicoCRDNames, "|")))
 }
 

pkg/crds/crds_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2024 Tigera, Inc. All rights reserved.
+// Copyright (c) 2021-2025 Tigera, Inc. All rights reserved.
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -42,4 +42,7 @@ var _ = Describe("test crds pkg", func() {
 	It("can get all CRDS used with Enterprise", func() {
 		Expect(func() { Expect(GetCRDs(opv1.TigeraSecureEnterprise)).ToNot(BeEmpty()) }).ToNot(Panic())
 	})
+	It("installs GatewayAPI CRD with Calico OSS", func() {
+		Expect(getOperatorCRDSource(opv1.Calico)).To(HaveKey(ContainSubstring("gatewayapis")))
+	})
 })

pkg/crds/enterprise/crd.projectcalico.org_felixconfigurations.yaml

@@ -181,7 +181,7 @@ spec:
                     type: string
                   tcpResetSeen:
                     description: |-
-                      TCPFinsSeen controls how long it takes before considering this entry for
+                      TCPResetSeen controls how long it takes before considering this entry for
                       cleanup after the connection was aborted. If nil, Calico uses its own
                       default value. [Default: 40s].
                     pattern: ^(([0-9]*(\.[0-9]*)?(ms|s|h|m|us)+)+|Auto)$
@@ -353,6 +353,14 @@ spec:
                   for cleanup.  This should be big enough to hold all the NAT entries that expire within one cleanup interval.
                 minimum: 1
                 type: integer
+              bpfMapSizeConntrackScaling:
+                description: |-
+                  BPFMapSizeConntrackScaling controls whether and how we scale the conntrack map size depending
+                  on its usage. 'Disabled' make the size stay at the default or whatever is set by
+                  BPFMapSizeConntrack*. 'DoubleIfFull' doubles the size when the map is pretty much full even
+                  after cleanups. [Default: DoubleIfFull]
+                pattern: ^(?i)(Disabled|DoubleIfFull)?$
+                type: string
               bpfMapSizeIPSets:
                 description: |-
                   BPFMapSizeIPSets sets the size for ipsets map.  The IP sets map must be large enough to hold an entry