Remove deprecated API: networking.antrea.tanzu.vmware.com v1beta1 (#2265

) Signed-off-by: Hang Yan <yhang@vmware.com>
antrea-io · Jun 15, 2021 · 5953984 · 5953984
1 parent 0cc9eb1
commit 5953984
Show file tree

Hide file tree

Showing 19 changed files with 55 additions and 308 deletions.
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -3088,7 +3088,6 @@ metadata:
 rules:
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3197,7 +3196,6 @@ rules:
   - delete
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3380,7 +3378,6 @@ rules:
   - v1beta1.system.antrea.tanzu.vmware.com
   - v1beta2.controlplane.antrea.tanzu.vmware.com
   - v1beta1.controlplane.antrea.tanzu.vmware.com
-  - v1beta1.networking.antrea.tanzu.vmware.com
   - v1alpha1.stats.antrea.io
   - v1beta1.system.antrea.io
   - v1beta2.controlplane.antrea.io
@@ -3389,6 +3386,14 @@ rules:
   verbs:
   - get
   - update
+- apiGroups:
+  - apiregistration.k8s.io
+  resourceNames:
+  - v1beta1.networking.antrea.tanzu.vmware.com
+  resources:
+  - apiservices
+  verbs:
+  - delete
 - apiGroups:
   - admissionregistration.k8s.io
   resourceNames:
@@ -4037,21 +4042,6 @@ spec:
 ---
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
-metadata:
-  labels:
-    app: antrea
-  name: v1beta1.networking.antrea.tanzu.vmware.com
-spec:
-  group: networking.antrea.tanzu.vmware.com
-  groupPriorityMinimum: 100
-  service:
-    name: antrea
-    namespace: kube-system
-  version: v1beta1
-  versionPriority: 100
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
 metadata:
   labels:
     app: antrea

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -3088,7 +3088,6 @@ metadata:
 rules:
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3197,7 +3196,6 @@ rules:
   - delete
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3380,7 +3378,6 @@ rules:
   - v1beta1.system.antrea.tanzu.vmware.com
   - v1beta2.controlplane.antrea.tanzu.vmware.com
   - v1beta1.controlplane.antrea.tanzu.vmware.com
-  - v1beta1.networking.antrea.tanzu.vmware.com
   - v1alpha1.stats.antrea.io
   - v1beta1.system.antrea.io
   - v1beta2.controlplane.antrea.io
@@ -3389,6 +3386,14 @@ rules:
   verbs:
   - get
   - update
+- apiGroups:
+  - apiregistration.k8s.io
+  resourceNames:
+  - v1beta1.networking.antrea.tanzu.vmware.com
+  resources:
+  - apiservices
+  verbs:
+  - delete
 - apiGroups:
   - admissionregistration.k8s.io
   resourceNames:
@@ -4037,21 +4042,6 @@ spec:
 ---
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
-metadata:
-  labels:
-    app: antrea
-  name: v1beta1.networking.antrea.tanzu.vmware.com
-spec:
-  group: networking.antrea.tanzu.vmware.com
-  groupPriorityMinimum: 100
-  service:
-    name: antrea
-    namespace: kube-system
-  version: v1beta1
-  versionPriority: 100
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
 metadata:
   labels:
     app: antrea

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -3088,7 +3088,6 @@ metadata:
 rules:
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3197,7 +3196,6 @@ rules:
   - delete
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3380,7 +3378,6 @@ rules:
   - v1beta1.system.antrea.tanzu.vmware.com
   - v1beta2.controlplane.antrea.tanzu.vmware.com
   - v1beta1.controlplane.antrea.tanzu.vmware.com
-  - v1beta1.networking.antrea.tanzu.vmware.com
   - v1alpha1.stats.antrea.io
   - v1beta1.system.antrea.io
   - v1beta2.controlplane.antrea.io
@@ -3389,6 +3386,14 @@ rules:
   verbs:
   - get
   - update
+- apiGroups:
+  - apiregistration.k8s.io
+  resourceNames:
+  - v1beta1.networking.antrea.tanzu.vmware.com
+  resources:
+  - apiservices
+  verbs:
+  - delete
 - apiGroups:
   - admissionregistration.k8s.io
   resourceNames:
@@ -4037,21 +4042,6 @@ spec:
 ---
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
-metadata:
-  labels:
-    app: antrea
-  name: v1beta1.networking.antrea.tanzu.vmware.com
-spec:
-  group: networking.antrea.tanzu.vmware.com
-  groupPriorityMinimum: 100
-  service:
-    name: antrea
-    namespace: kube-system
-  version: v1beta1
-  versionPriority: 100
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
 metadata:
   labels:
     app: antrea

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -3088,7 +3088,6 @@ metadata:
 rules:
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3197,7 +3196,6 @@ rules:
   - delete
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3380,7 +3378,6 @@ rules:
   - v1beta1.system.antrea.tanzu.vmware.com
   - v1beta2.controlplane.antrea.tanzu.vmware.com
   - v1beta1.controlplane.antrea.tanzu.vmware.com
-  - v1beta1.networking.antrea.tanzu.vmware.com
   - v1alpha1.stats.antrea.io
   - v1beta1.system.antrea.io
   - v1beta2.controlplane.antrea.io
@@ -3389,6 +3386,14 @@ rules:
   verbs:
   - get
   - update
+- apiGroups:
+  - apiregistration.k8s.io
+  resourceNames:
+  - v1beta1.networking.antrea.tanzu.vmware.com
+  resources:
+  - apiservices
+  verbs:
+  - delete
 - apiGroups:
   - admissionregistration.k8s.io
   resourceNames:
@@ -4051,21 +4056,6 @@ spec:
 ---
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
-metadata:
-  labels:
-    app: antrea
-  name: v1beta1.networking.antrea.tanzu.vmware.com
-spec:
-  group: networking.antrea.tanzu.vmware.com
-  groupPriorityMinimum: 100
-  service:
-    name: antrea
-    namespace: kube-system
-  version: v1beta1
-  versionPriority: 100
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
 metadata:
   labels:
     app: antrea

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -3088,7 +3088,6 @@ metadata:
 rules:
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3197,7 +3196,6 @@ rules:
   - delete
 - apiGroups:
   - controlplane.antrea.tanzu.vmware.com
-  - networking.antrea.tanzu.vmware.com
   - controlplane.antrea.io
   resources:
   - networkpolicies
@@ -3380,7 +3378,6 @@ rules:
   - v1beta1.system.antrea.tanzu.vmware.com
   - v1beta2.controlplane.antrea.tanzu.vmware.com
   - v1beta1.controlplane.antrea.tanzu.vmware.com
-  - v1beta1.networking.antrea.tanzu.vmware.com
   - v1alpha1.stats.antrea.io
   - v1beta1.system.antrea.io
   - v1beta2.controlplane.antrea.io
@@ -3389,6 +3386,14 @@ rules:
   verbs:
   - get
   - update
+- apiGroups:
+  - apiregistration.k8s.io
+  resourceNames:
+  - v1beta1.networking.antrea.tanzu.vmware.com
+  resources:
+  - apiservices
+  verbs:
+  - delete
 - apiGroups:
   - admissionregistration.k8s.io
   resourceNames:
@@ -4042,21 +4047,6 @@ spec:
 ---
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
-metadata:
-  labels:
-    app: antrea
-  name: v1beta1.networking.antrea.tanzu.vmware.com
-spec:
-  group: networking.antrea.tanzu.vmware.com
-  groupPriorityMinimum: 100
-  service:
-    name: antrea
-    namespace: kube-system
-  version: v1beta1
-  versionPriority: 100
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
 metadata:
   labels:
     app: antrea

diff --git a/build/yamls/base/agent-rbac.yml b/build/yamls/base/agent-rbac.yml
@@ -57,7 +57,6 @@ rules:
       - delete
   - apiGroups:
       - controlplane.antrea.tanzu.vmware.com
-      - networking.antrea.tanzu.vmware.com
       - controlplane.antrea.io
     resources:
       - networkpolicies

diff --git a/build/yamls/base/antctl.yml b/build/yamls/base/antctl.yml
@@ -12,7 +12,6 @@ metadata:
 rules:
   - apiGroups:
       - controlplane.antrea.tanzu.vmware.com
-      - networking.antrea.tanzu.vmware.com
       - controlplane.antrea.io
     resources:
       - networkpolicies

diff --git a/build/yamls/base/controller-rbac.yml b/build/yamls/base/controller-rbac.yml
@@ -90,13 +90,20 @@ rules:
       - v1beta1.system.antrea.tanzu.vmware.com
       - v1beta2.controlplane.antrea.tanzu.vmware.com
       - v1beta1.controlplane.antrea.tanzu.vmware.com
-      - v1beta1.networking.antrea.tanzu.vmware.com
       - v1alpha1.stats.antrea.io
       - v1beta1.system.antrea.io
       - v1beta2.controlplane.antrea.io
     verbs:
       - get
       - update
+  - apiGroups:
+      - apiregistration.k8s.io
+    resources:
+      - apiservices
+    resourceNames:
+      - v1beta1.networking.antrea.tanzu.vmware.com
+    verbs:
+      - delete
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

diff --git a/build/yamls/base/controller.yml b/build/yamls/base/controller.yml
@@ -287,20 +287,6 @@ spec:
     name: antrea
     namespace: kube-system
 ---
-# Deprecated in v0.10
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
-metadata:
-  name: v1beta1.networking.antrea.tanzu.vmware.com
-spec:
-  group: networking.antrea.tanzu.vmware.com
-  groupPriorityMinimum: 100
-  version: v1beta1
-  versionPriority: 100
-  service:
-    name: antrea
-    namespace: kube-system
----
 # Deprecated in v1.0.0.
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService

diff --git a/docs/api.md b/docs/api.md
@@ -17,7 +17,6 @@ These are the API group versions which are curently available when using Antrea.
 | `core.antrea.tanzu.vmware.com` | `v1alpha2` | No | v0.11.0 | v1.0.0 | Dec 2021 |
 | `controlplane.antrea.tanzu.vmware.com` | `v1beta1` | Yes | v0.10.0 | v0.11.0 | Aug 2021 |
 | `controlplane.antrea.tanzu.vmware.com` | `v1beta2` | Yes | v0.11.0 | v1.0.0 | Dec 2021 |
-| `networking.antrea.tanzu.vmware.com` | `v1beta1` | Yes | v0.3.0 | v0.10.0 | Jun 2021 |
 | `ops.antrea.tanzu.vmware.com` | `v1alpha1` | No | v0.8.0 | v1.0.0 | Dec 2021 |
 | `security.antrea.tanzu.vmware.com` | `v1alpha1` | No | v0.8.0 | v1.0.0 | Dec 2021 |
 | `stats.antrea.tanzu.vmware.com` | `v1alpha1` | Yes | v0.10.0 | v1.0.0 | Dec 2021 |
@@ -34,6 +33,7 @@ These are the API group versions which are curently available when using Antrea.
 | API group | API version | API Service? | Introduced in | Deprecated in | Removed in |
 |---|---|---|---|---|---|
 | `core.antrea.tanzu.vmware.com` | `v1alpha1` | No | v0.8.0 | v0.11.0 | v0.11.0 |
+| `networking.antrea.tanzu.vmware.com` | `v1beta1` | Yes | v0.3.0 | v0.10.0 | v1.2.0 |
 
 ## API renaming from `*.antrea.tanzu.vmware.com` to `*.antrea.io`
 

diff --git a/pkg/agent/openflow/client.go b/pkg/agent/openflow/client.go
@@ -166,7 +166,7 @@ type Client interface {
 	// mark for a SNAT IP.
 	UninstallSNATMarkFlows(mark uint32) error
 
-	// InstallSNATPolicyFlow installs the SNAT flows for a local Pod. If the
+	// InstallPodSNATFlows installs the SNAT flows for a local Pod. If the
 	// SNAT IP for the Pod is on the local Node, a non-zero SNAT ID should
 	// allocated for the SNAT IP, and the installed flow sets the SNAT IP
 	// mark on the egress packets from the ofPort; if the SNAT IP is on a

diff --git a/pkg/agent/openflow/pipeline.go b/pkg/agent/openflow/pipeline.go
@@ -1865,7 +1865,7 @@ func (c *client) snatIPFromTunnelFlow(snatIP net.IP, mark uint32) binding.Flow {
 }
 
 // snatRuleFlow generates a flow that applies the SNAT rule for a local Pod. If
-// the SNAT IP exists on the lcoal Node, it sets the packet mark with the ID of
+// the SNAT IP exists on the local Node, it sets the packet mark with the ID of
 // the SNAT IP, for the traffic from the ofPort to external; if the SNAT IP is
 // on a remote Node, it tunnels the packets to the SNAT IP.
 func (c *client) snatRuleFlow(ofPort uint32, snatIP net.IP, snatMark uint32, localGatewayMAC net.HardwareAddr) binding.Flow {