diff --git a/build/charts/antrea/conf/antrea-agent.conf b/build/charts/antrea/conf/antrea-agent.conf index 71896837a62..e140f3c0790 100644 --- a/build/charts/antrea/conf/antrea-agent.conf +++ b/build/charts/antrea/conf/antrea-agent.conf @@ -18,7 +18,7 @@ featureGates: # Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to # be enabled, otherwise this flag will not take effect. -{{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "CleanupStaleUDPSvcConntrack" "default" false) }} +{{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "CleanupStaleUDPSvcConntrack" "default" true) }} # Enable traceflow which provides packet tracing feature to diagnose network issue. {{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "Traceflow" "default" true) }} diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml index 73dcb502d4a..9655b66b5da 100644 --- a/build/yamls/antrea-aks.yml +++ b/build/yamls/antrea-aks.yml @@ -3605,7 +3605,7 @@ data: # Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to # be enabled, otherwise this flag will not take effect. - # CleanupStaleUDPSvcConntrack: false + # CleanupStaleUDPSvcConntrack: true # Enable traceflow which provides packet tracing feature to diagnose network issue. # Traceflow: true @@ -4975,7 +4975,7 @@ spec: kubectl.kubernetes.io/default-container: antrea-agent # Automatically restart Pods with a RollingUpdate if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 47a8888bb99a5b1a08dea61e9315bacf613d869d718712ad0eb9964bb73dc0ec + checksum/config: f976029accf54258d01ad907fe19b50ac671eee014cd8aea968c6a0bc7e8f95a labels: app: antrea component: antrea-agent @@ -5213,7 +5213,7 @@ spec: annotations: # Automatically restart Pod if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 47a8888bb99a5b1a08dea61e9315bacf613d869d718712ad0eb9964bb73dc0ec + checksum/config: f976029accf54258d01ad907fe19b50ac671eee014cd8aea968c6a0bc7e8f95a labels: app: antrea component: antrea-controller diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml index d0435aef30f..d60cc445413 100644 --- a/build/yamls/antrea-eks.yml +++ b/build/yamls/antrea-eks.yml @@ -3605,7 +3605,7 @@ data: # Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to # be enabled, otherwise this flag will not take effect. - # CleanupStaleUDPSvcConntrack: false + # CleanupStaleUDPSvcConntrack: true # Enable traceflow which provides packet tracing feature to diagnose network issue. # Traceflow: true @@ -4975,7 +4975,7 @@ spec: kubectl.kubernetes.io/default-container: antrea-agent # Automatically restart Pods with a RollingUpdate if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 47a8888bb99a5b1a08dea61e9315bacf613d869d718712ad0eb9964bb73dc0ec + checksum/config: f976029accf54258d01ad907fe19b50ac671eee014cd8aea968c6a0bc7e8f95a labels: app: antrea component: antrea-agent @@ -5214,7 +5214,7 @@ spec: annotations: # Automatically restart Pod if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 47a8888bb99a5b1a08dea61e9315bacf613d869d718712ad0eb9964bb73dc0ec + checksum/config: f976029accf54258d01ad907fe19b50ac671eee014cd8aea968c6a0bc7e8f95a labels: app: antrea component: antrea-controller diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml index 8401b0a94b0..8fb55a482f9 100644 --- a/build/yamls/antrea-gke.yml +++ b/build/yamls/antrea-gke.yml @@ -3605,7 +3605,7 @@ data: # Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to # be enabled, otherwise this flag will not take effect. - # CleanupStaleUDPSvcConntrack: false + # CleanupStaleUDPSvcConntrack: true # Enable traceflow which provides packet tracing feature to diagnose network issue. # Traceflow: true @@ -4975,7 +4975,7 @@ spec: kubectl.kubernetes.io/default-container: antrea-agent # Automatically restart Pods with a RollingUpdate if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 47c353c05a3d0d6da5534e0cd1202fefb175fff41421eb3517bc9f3dd084e2ce + checksum/config: 5299e6235e262daf606758cf900766470fcb8dd21a0d707a3ae284548bd8c2b2 labels: app: antrea component: antrea-agent @@ -5211,7 +5211,7 @@ spec: annotations: # Automatically restart Pod if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 47c353c05a3d0d6da5534e0cd1202fefb175fff41421eb3517bc9f3dd084e2ce + checksum/config: 5299e6235e262daf606758cf900766470fcb8dd21a0d707a3ae284548bd8c2b2 labels: app: antrea component: antrea-controller diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml index 91964dd82a3..c843452c63c 100644 --- a/build/yamls/antrea-ipsec.yml +++ b/build/yamls/antrea-ipsec.yml @@ -3618,7 +3618,7 @@ data: # Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to # be enabled, otherwise this flag will not take effect. - # CleanupStaleUDPSvcConntrack: false + # CleanupStaleUDPSvcConntrack: true # Enable traceflow which provides packet tracing feature to diagnose network issue. # Traceflow: true @@ -4988,7 +4988,7 @@ spec: kubectl.kubernetes.io/default-container: antrea-agent # Automatically restart Pods with a RollingUpdate if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: ce4457f4d8a5bda332dbdd877c15ad152e3bbbcb0c9626c57ccd17518e407562 + checksum/config: ba93df141f512a1f8483114b5994444c7231b298e7e9133483ddc1f4210ec395 checksum/ipsec-secret: d0eb9c52d0cd4311b6d252a951126bf9bea27ec05590bed8a394f0f792dcb2a4 labels: app: antrea @@ -5270,7 +5270,7 @@ spec: annotations: # Automatically restart Pod if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: ce4457f4d8a5bda332dbdd877c15ad152e3bbbcb0c9626c57ccd17518e407562 + checksum/config: ba93df141f512a1f8483114b5994444c7231b298e7e9133483ddc1f4210ec395 labels: app: antrea component: antrea-controller diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml index 53b32787a9b..60e8df147d4 100644 --- a/build/yamls/antrea.yml +++ b/build/yamls/antrea.yml @@ -3605,7 +3605,7 @@ data: # Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to # be enabled, otherwise this flag will not take effect. - # CleanupStaleUDPSvcConntrack: false + # CleanupStaleUDPSvcConntrack: true # Enable traceflow which provides packet tracing feature to diagnose network issue. # Traceflow: true @@ -4975,7 +4975,7 @@ spec: kubectl.kubernetes.io/default-container: antrea-agent # Automatically restart Pods with a RollingUpdate if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 7c86f86246f3b203e46613dacbd724e9ca8eae3428451acdc7bfe54123deb534 + checksum/config: aca23e21519e0fc112647f23d3ce6f92a3dea0bc7ebf1c6d7a7eed2dbe80f0a3 labels: app: antrea component: antrea-agent @@ -5211,7 +5211,7 @@ spec: annotations: # Automatically restart Pod if the ConfigMap changes # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments - checksum/config: 7c86f86246f3b203e46613dacbd724e9ca8eae3428451acdc7bfe54123deb534 + checksum/config: aca23e21519e0fc112647f23d3ce6f92a3dea0bc7ebf1c6d7a7eed2dbe80f0a3 labels: app: antrea component: antrea-controller diff --git a/docs/feature-gates.md b/docs/feature-gates.md index 20de5037fe7..287d9dacc58 100644 --- a/docs/feature-gates.md +++ b/docs/feature-gates.md @@ -35,7 +35,7 @@ edit the Agent configuration in the | `AntreaProxy` | Agent | `true` | GA | v0.8 | v0.11 | v1.14 | Yes | Must be enabled for Windows. | | `EndpointSlice` | Agent | `true` | GA | v0.13.0 | v1.11 | v1.14 | Yes | | | `TopologyAwareHints` | Agent | `true` | Beta | v1.8 | v1.12 | N/A | Yes | | -| `CleanupStaleUDPSvcConntrack` | Agent | `false` | Alpha | v1.13 | N/A | N/A | Yes | | +| `CleanupStaleUDPSvcConntrack` | Agent | `true` | Beta | v1.13 | v2.1 | N/A | Yes | | | `LoadBalancerModeDSR` | Agent | `false` | Alpha | v1.13 | N/A | N/A | Yes | | | `AntreaPolicy` | Agent + Controller | `true` | Beta | v0.8 | v1.0 | N/A | No | Agent side config required from v0.9.0+. | | `Traceflow` | Agent + Controller | `true` | Beta | v0.8 | v0.11 | N/A | Yes | | diff --git a/pkg/apiserver/handlers/featuregates/handler_test.go b/pkg/apiserver/handlers/featuregates/handler_test.go index 3a8f3d78494..adb630a1324 100644 --- a/pkg/apiserver/handlers/featuregates/handler_test.go +++ b/pkg/apiserver/handlers/featuregates/handler_test.go @@ -33,8 +33,9 @@ import ( ) var ( - egressStatus string - multicastStatus string + egressStatus string + multicastStatus string + cleanupStaleUDPSvcConntrackStatus string ) func Test_getGatesResponse(t *testing.T) { @@ -54,7 +55,7 @@ func Test_getGatesResponse(t *testing.T) { {Component: "agent", Name: "AntreaIPAM", Status: "Disabled", Version: "ALPHA"}, {Component: "agent", Name: "AntreaPolicy", Status: "Disabled", Version: "BETA"}, {Component: "agent", Name: "AntreaProxy", Status: "Enabled", Version: "GA"}, - {Component: "agent", Name: "CleanupStaleUDPSvcConntrack", Status: "Disabled", Version: "ALPHA"}, + {Component: "agent", Name: "CleanupStaleUDPSvcConntrack", Status: cleanupStaleUDPSvcConntrackStatus, Version: "BETA"}, {Component: "agent", Name: "Egress", Status: egressStatus, Version: "BETA"}, {Component: "agent", Name: "EgressSeparateSubnet", Status: "Disabled", Version: "ALPHA"}, {Component: "agent", Name: "EgressTrafficShaping", Status: "Disabled", Version: "ALPHA"}, @@ -219,8 +220,10 @@ func Test_getControllerGatesResponse(t *testing.T) { func init() { egressStatus = "Enabled" multicastStatus = "Enabled" + cleanupStaleUDPSvcConntrackStatus = "Enabled" if runtime.IsWindowsPlatform() { egressStatus = "Disabled" multicastStatus = "Disabled" + cleanupStaleUDPSvcConntrackStatus = "Disabled" } } diff --git a/pkg/features/antrea_features.go b/pkg/features/antrea_features.go index fe673654552..05cb51a9df5 100644 --- a/pkg/features/antrea_features.go +++ b/pkg/features/antrea_features.go @@ -51,6 +51,7 @@ const ( TopologyAwareHints featuregate.Feature = "TopologyAwareHints" // alpha: v1.13 + // beta: v2.1 // Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. CleanupStaleUDPSvcConntrack featuregate.Feature = "CleanupStaleUDPSvcConntrack" @@ -181,7 +182,7 @@ var ( Egress: {Default: true, PreRelease: featuregate.Beta}, EndpointSlice: {Default: true, PreRelease: featuregate.GA}, TopologyAwareHints: {Default: true, PreRelease: featuregate.Beta}, - CleanupStaleUDPSvcConntrack: {Default: false, PreRelease: featuregate.Alpha}, + CleanupStaleUDPSvcConntrack: {Default: true, PreRelease: featuregate.Beta}, Traceflow: {Default: true, PreRelease: featuregate.Beta}, AntreaIPAM: {Default: false, PreRelease: featuregate.Alpha}, FlowExporter: {Default: false, PreRelease: featuregate.Alpha},