Skip to content

Commit 7bd5d51

Browse files
honglianglhongliangl
authored
Remove feature gates AntreaProxy and NodePortLocal from chart / standard manifests (#7505)
Signed-off-by: Hongliang Liu <[email protected]>
1 parent c8ba2e1 commit 7bd5d51

File tree

10 files changed

+17
-103
lines changed

10 files changed

+17
-103
lines changed

‎build/charts/antrea-windows/conf/antrea-agent.conf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
# FeatureGates is a map of feature names to bools that enable or disable experimental features.
22
featureGates:
3-
# Enable antrea proxy which provides ServiceLB for in-cluster services in antrea agent.
4-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
5-
# Service traffic. Note that this feature gate is deprecated since this feature was
6-
# promoted to GA in v1.14.
7-
# AntreaProxy: true
8-
9-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
10-
# NodePortLocal: true
11-
123
# Enable flowexporter which exports polled conntrack connections as IPFIX flow records from each agent to a configured collector.
134
# FlowExporter: false
145

‎build/charts/antrea/conf/antrea-agent.conf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ featureGates:
66
# AllBeta is a global toggle for beta features. Per-feature key values override the default set by AllBeta.
77
{{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "AllBeta" "default" false) }}
88

9-
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
10-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
11-
# Service traffic. Note that this feature gate is deprecated since this feature was
12-
# promoted to GA in v1.14.
13-
{{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "AntreaProxy" "default" true) }}
14-
159
# Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to
1610
# be enabled, otherwise this flag will not take effect.
1711
{{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "CleanupStaleUDPSvcConntrack" "default" true) }}
@@ -22,9 +16,6 @@ featureGates:
2216
# Enable PacketCapture feature which supports capturing packets to diagnose network issues.
2317
{{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "PacketCapture" "default" false) }}
2418

25-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
26-
{{- include "featureGate" (dict "featureGates" .Values.featureGates "name" "NodePortLocal" "default" true) }}
27-
2819
# Enable Antrea ClusterNetworkPolicy feature to complement K8s NetworkPolicy for cluster admins
2920
# to define security policies which apply to the entire cluster, and Antrea NetworkPolicy
3021
# feature that supports priorities, rule actions and externalEntities in the future.

‎build/yamls/antrea-aks.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4031,12 +4031,6 @@ data:
40314031
# AllBeta is a global toggle for beta features. Per-feature key values override the default set by AllBeta.
40324032
# AllBeta: false
40334033
4034-
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
4035-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
4036-
# Service traffic. Note that this feature gate is deprecated since this feature was
4037-
# promoted to GA in v1.14.
4038-
# AntreaProxy: true
4039-
40404034
# Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to
40414035
# be enabled, otherwise this flag will not take effect.
40424036
# CleanupStaleUDPSvcConntrack: true
@@ -4047,9 +4041,6 @@ data:
40474041
# Enable PacketCapture feature which supports capturing packets to diagnose network issues.
40484042
# PacketCapture: false
40494043
4050-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
4051-
# NodePortLocal: true
4052-
40534044
# Enable Antrea ClusterNetworkPolicy feature to complement K8s NetworkPolicy for cluster admins
40544045
# to define security policies which apply to the entire cluster, and Antrea NetworkPolicy
40554046
# feature that supports priorities, rule actions and externalEntities in the future.
@@ -5511,7 +5502,7 @@ spec:
55115502
kubectl.kubernetes.io/default-container: antrea-agent
55125503
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
55135504
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5514-
checksum/config: 50238db8d64976fc383c4ed12d77846aa16d8b0cbd56f8ec70bba097942641d4
5505+
checksum/config: 90cbf17ac4db8d4a742e5855a60eed3f1999f820b6f9645b81e2f16c555b9f43
55155506
labels:
55165507
app: antrea
55175508
component: antrea-agent
@@ -5759,7 +5750,7 @@ spec:
57595750
annotations:
57605751
# Automatically restart Pod if the ConfigMap changes
57615752
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5762-
checksum/config: 50238db8d64976fc383c4ed12d77846aa16d8b0cbd56f8ec70bba097942641d4
5753+
checksum/config: 90cbf17ac4db8d4a742e5855a60eed3f1999f820b6f9645b81e2f16c555b9f43
57635754
labels:
57645755
app: antrea
57655756
component: antrea-controller

‎build/yamls/antrea-eks.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4027,12 +4027,6 @@ data:
40274027
# AllBeta is a global toggle for beta features. Per-feature key values override the default set by AllBeta.
40284028
# AllBeta: false
40294029
4030-
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
4031-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
4032-
# Service traffic. Note that this feature gate is deprecated since this feature was
4033-
# promoted to GA in v1.14.
4034-
# AntreaProxy: true
4035-
40364030
# Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to
40374031
# be enabled, otherwise this flag will not take effect.
40384032
# CleanupStaleUDPSvcConntrack: true
@@ -4043,9 +4037,6 @@ data:
40434037
# Enable PacketCapture feature which supports capturing packets to diagnose network issues.
40444038
# PacketCapture: false
40454039
4046-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
4047-
# NodePortLocal: true
4048-
40494040
# Enable Antrea ClusterNetworkPolicy feature to complement K8s NetworkPolicy for cluster admins
40504041
# to define security policies which apply to the entire cluster, and Antrea NetworkPolicy
40514042
# feature that supports priorities, rule actions and externalEntities in the future.
@@ -5507,7 +5498,7 @@ spec:
55075498
kubectl.kubernetes.io/default-container: antrea-agent
55085499
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
55095500
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5510-
checksum/config: 50238db8d64976fc383c4ed12d77846aa16d8b0cbd56f8ec70bba097942641d4
5501+
checksum/config: 90cbf17ac4db8d4a742e5855a60eed3f1999f820b6f9645b81e2f16c555b9f43
55115502
labels:
55125503
app: antrea
55135504
component: antrea-agent
@@ -5756,7 +5747,7 @@ spec:
57565747
annotations:
57575748
# Automatically restart Pod if the ConfigMap changes
57585749
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5759-
checksum/config: 50238db8d64976fc383c4ed12d77846aa16d8b0cbd56f8ec70bba097942641d4
5750+
checksum/config: 90cbf17ac4db8d4a742e5855a60eed3f1999f820b6f9645b81e2f16c555b9f43
57605751
labels:
57615752
app: antrea
57625753
component: antrea-controller

‎build/yamls/antrea-gke.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4027,12 +4027,6 @@ data:
40274027
# AllBeta is a global toggle for beta features. Per-feature key values override the default set by AllBeta.
40284028
# AllBeta: false
40294029
4030-
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
4031-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
4032-
# Service traffic. Note that this feature gate is deprecated since this feature was
4033-
# promoted to GA in v1.14.
4034-
# AntreaProxy: true
4035-
40364030
# Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to
40374031
# be enabled, otherwise this flag will not take effect.
40384032
# CleanupStaleUDPSvcConntrack: true
@@ -4043,9 +4037,6 @@ data:
40434037
# Enable PacketCapture feature which supports capturing packets to diagnose network issues.
40444038
# PacketCapture: false
40454039
4046-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
4047-
# NodePortLocal: true
4048-
40494040
# Enable Antrea ClusterNetworkPolicy feature to complement K8s NetworkPolicy for cluster admins
40504041
# to define security policies which apply to the entire cluster, and Antrea NetworkPolicy
40514042
# feature that supports priorities, rule actions and externalEntities in the future.
@@ -5498,7 +5489,7 @@ spec:
54985489
kubectl.kubernetes.io/default-container: antrea-agent
54995490
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
55005491
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5501-
checksum/config: baf8ba7d5877b2dc0c9e0c6215026c8364d9ecdca686fc1aa8fd3a32982b7fb0
5492+
checksum/config: 0fc81a765939ed017c8de4544840a42979866447edb87d126498653f4dc5d8af
55025493
labels:
55035494
app: antrea
55045495
component: antrea-agent
@@ -5744,7 +5735,7 @@ spec:
57445735
annotations:
57455736
# Automatically restart Pod if the ConfigMap changes
57465737
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5747-
checksum/config: baf8ba7d5877b2dc0c9e0c6215026c8364d9ecdca686fc1aa8fd3a32982b7fb0
5738+
checksum/config: 0fc81a765939ed017c8de4544840a42979866447edb87d126498653f4dc5d8af
57485739
labels:
57495740
app: antrea
57505741
component: antrea-controller

‎build/yamls/antrea-ipsec.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4040,12 +4040,6 @@ data:
40404040
# AllBeta is a global toggle for beta features. Per-feature key values override the default set by AllBeta.
40414041
# AllBeta: false
40424042
4043-
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
4044-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
4045-
# Service traffic. Note that this feature gate is deprecated since this feature was
4046-
# promoted to GA in v1.14.
4047-
# AntreaProxy: true
4048-
40494043
# Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to
40504044
# be enabled, otherwise this flag will not take effect.
40514045
# CleanupStaleUDPSvcConntrack: true
@@ -4056,9 +4050,6 @@ data:
40564050
# Enable PacketCapture feature which supports capturing packets to diagnose network issues.
40574051
# PacketCapture: false
40584052
4059-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
4060-
# NodePortLocal: true
4061-
40624053
# Enable Antrea ClusterNetworkPolicy feature to complement K8s NetworkPolicy for cluster admins
40634054
# to define security policies which apply to the entire cluster, and Antrea NetworkPolicy
40644055
# feature that supports priorities, rule actions and externalEntities in the future.
@@ -5511,7 +5502,7 @@ spec:
55115502
kubectl.kubernetes.io/default-container: antrea-agent
55125503
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
55135504
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5514-
checksum/config: 2a32d839f33b5904610fe474c008497237db33594a1672de7657ce6306e11d6e
5505+
checksum/config: 40949a7f8417c0a9d329bd0a0b5dc369a7bfb4cadd949098c4fab489e6bc7618
55155506
checksum/ipsec-secret: d0eb9c52d0cd4311b6d252a951126bf9bea27ec05590bed8a394f0f792dcb2a4
55165507
labels:
55175508
app: antrea
@@ -5803,7 +5794,7 @@ spec:
58035794
annotations:
58045795
# Automatically restart Pod if the ConfigMap changes
58055796
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5806-
checksum/config: 2a32d839f33b5904610fe474c008497237db33594a1672de7657ce6306e11d6e
5797+
checksum/config: 40949a7f8417c0a9d329bd0a0b5dc369a7bfb4cadd949098c4fab489e6bc7618
58075798
labels:
58085799
app: antrea
58095800
component: antrea-controller

‎build/yamls/antrea-windows-with-ovs.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,6 @@ data:
131131
antrea-agent.conf: |
132132
# FeatureGates is a map of feature names to bools that enable or disable experimental features.
133133
featureGates:
134-
# Enable antrea proxy which provides ServiceLB for in-cluster services in antrea agent.
135-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
136-
# Service traffic. Note that this feature gate is deprecated since this feature was
137-
# promoted to GA in v1.14.
138-
# AntreaProxy: true
139-
140-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
141-
# NodePortLocal: true
142-
143134
# Enable flowexporter which exports polled conntrack connections as IPFIX flow records from each agent to a configured collector.
144135
# FlowExporter: false
145136
@@ -275,7 +266,7 @@ spec:
275266
metadata:
276267
annotations:
277268
checksum/agent-windows: 4a8b62e6d8076e1792f4a0a880a806016eb6991994c7cc63ac71bcf5bb2f9432
278-
checksum/windows-config: 985f1ad21792b310a890e71b57dc258d8a1f5241260989b814c3b93910607afd
269+
checksum/windows-config: 8de6c7d02c73254e5a28d09aa0e3708cb7800b390222db422cac63a562146999
279270
microsoft.com/hostprocess-inherit-user: "true"
280271
labels:
281272
app: antrea

‎build/yamls/antrea-windows.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ data:
5555
antrea-agent.conf: |
5656
# FeatureGates is a map of feature names to bools that enable or disable experimental features.
5757
featureGates:
58-
# Enable antrea proxy which provides ServiceLB for in-cluster services in antrea agent.
59-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
60-
# Service traffic. Note that this feature gate is deprecated since this feature was
61-
# promoted to GA in v1.14.
62-
# AntreaProxy: true
63-
64-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
65-
# NodePortLocal: true
66-
6758
# Enable flowexporter which exports polled conntrack connections as IPFIX flow records from each agent to a configured collector.
6859
# FlowExporter: false
6960
@@ -199,7 +190,7 @@ spec:
199190
metadata:
200191
annotations:
201192
checksum/agent-windows: 63f16e1fadb6b1354efda21c73702b4290400181136d4d47d4b1cd6a5f82d037
202-
checksum/windows-config: 985f1ad21792b310a890e71b57dc258d8a1f5241260989b814c3b93910607afd
193+
checksum/windows-config: 8de6c7d02c73254e5a28d09aa0e3708cb7800b390222db422cac63a562146999
203194
microsoft.com/hostprocess-inherit-user: "true"
204195
labels:
205196
app: antrea

‎build/yamls/antrea.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4027,12 +4027,6 @@ data:
40274027
# AllBeta is a global toggle for beta features. Per-feature key values override the default set by AllBeta.
40284028
# AllBeta: false
40294029
4030-
# Enable AntreaProxy which provides ServiceLB for in-cluster Services in antrea-agent.
4031-
# It should be enabled on Windows, otherwise NetworkPolicy will not take effect on
4032-
# Service traffic. Note that this feature gate is deprecated since this feature was
4033-
# promoted to GA in v1.14.
4034-
# AntreaProxy: true
4035-
40364030
# Enable support for cleaning up stale UDP Service conntrack connections in AntreaProxy. This requires AntreaProxy to
40374031
# be enabled, otherwise this flag will not take effect.
40384032
# CleanupStaleUDPSvcConntrack: true
@@ -4043,9 +4037,6 @@ data:
40434037
# Enable PacketCapture feature which supports capturing packets to diagnose network issues.
40444038
# PacketCapture: false
40454039
4046-
# Enable NodePortLocal feature to make the Pods reachable externally through NodePort
4047-
# NodePortLocal: true
4048-
40494040
# Enable Antrea ClusterNetworkPolicy feature to complement K8s NetworkPolicy for cluster admins
40504041
# to define security policies which apply to the entire cluster, and Antrea NetworkPolicy
40514042
# feature that supports priorities, rule actions and externalEntities in the future.
@@ -5498,7 +5489,7 @@ spec:
54985489
kubectl.kubernetes.io/default-container: antrea-agent
54995490
# Automatically restart Pods with a RollingUpdate if the ConfigMap changes
55005491
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5501-
checksum/config: 98ff130e6c9bba0de4a4c66211626612c01a1068201b6d8cbb6375d4fb35121c
5492+
checksum/config: eb620a4a201c48a6d049e95571c591466d3c88c714704e57fdcbf3a327e6d672
55025493
labels:
55035494
app: antrea
55045495
component: antrea-agent
@@ -5744,7 +5735,7 @@ spec:
57445735
annotations:
57455736
# Automatically restart Pod if the ConfigMap changes
57465737
# See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
5747-
checksum/config: 98ff130e6c9bba0de4a4c66211626612c01a1068201b6d8cbb6375d4fb35121c
5738+
checksum/config: eb620a4a201c48a6d049e95571c591466d3c88c714704e57fdcbf3a327e6d672
57485739
labels:
57495740
app: antrea
57505741
component: antrea-controller

‎docs/node-port-local.md‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@ directly to backend Pods.
2828
## Prerequisites
2929

3030
NodePortLocal was introduced in v0.13 as an alpha feature, and was graduated to
31-
beta in v1.4, at which time it was enabled by default. Prior to v1.4, a feature
32-
gate, `NodePortLocal`, must be enabled on the antrea-agent for the feature to
33-
work. Starting from Antrea v1.7, NPL is supported on the Windows antrea-agent.
34-
From Antrea v1.14, NPL is GA.
31+
beta in v1.4, at which time it was enabled by default. Starting from Antrea v1.7,
32+
NPL is supported on the Windows antrea-agent. From Antrea v1.14, NPL is GA.
3533

3634
## Usage
3735

38-
In addition to enabling the NodePortLocal feature gate (if needed), you need to
39-
ensure that the `nodePortLocal.enable` flag is set to true in the Antrea Agent
36+
To enable the NodePortLocal, you need to ensure that the `nodePortLocal.enable`
37+
flag is set to true in the Antrea Agent
4038
configuration. The `nodePortLocal.portRange` parameter can also be set to change
4139
the range from which Node ports will be allocated. Otherwise, the range
4240
of `61000-62000` will be used by default on Linux, and the range `40000-41000` will
@@ -51,9 +49,6 @@ metadata:
5149
namespace: kube-system
5250
data:
5351
antrea-agent.conf: |
54-
featureGates:
55-
# True by default starting with Antrea v1.4
56-
# NodePortLocal: true
5752
nodePortLocal:
5853
enable: true
5954
# Uncomment if you need to change the port range.
@@ -104,7 +99,7 @@ spec:
10499
image: nginx
105100
```
106101

107-
If the NodePortLocal feature gate is enabled, then all the Pods in the
102+
If the `nodePortLocal.enable` flag is set to true, then all the Pods in the
108103
Deployment will be annotated with the `nodeportlocal.antrea.io` annotation. The
109104
value of this annotation is a serialized JSON array. In our example, a given Pod
110105
in the `nginx` Deployment may look like this:

0 commit comments

Comments
 (0)