Clean up deprecated APIServices (#6002)

These APIServices were removed in Antrea v1.6 and it's safe to assume none of them still exists in the cluster when deploying the upcoming Antrea v2.0. Signed-off-by: Quan Tian <qtian@vmware.com>
antrea-io · Feb 21, 2024 · 9be4ec2 · 9be4ec2
1 parent eaf8e26
commit 9be4ec2
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 79 deletions.
diff --git a/build/charts/antrea/templates/controller/clusterrole.yaml b/build/charts/antrea/templates/controller/clusterrole.yaml
@@ -112,18 +112,6 @@ rules:
     verbs:
       - list
       - update
-  - apiGroups:
-      - apiregistration.k8s.io
-    resources:
-      - apiservices
-    resourceNames:
-      - v1beta1.networking.antrea.tanzu.vmware.com
-      - v1beta1.controlplane.antrea.tanzu.vmware.com
-      - v1alpha1.stats.antrea.tanzu.vmware.com
-      - v1beta1.system.antrea.tanzu.vmware.com
-      - v1beta2.controlplane.antrea.tanzu.vmware.com
-    verbs:
-      - delete
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -6556,18 +6556,6 @@ rules:
     verbs:
       - list
       - update
-  - apiGroups:
-      - apiregistration.k8s.io
-    resources:
-      - apiservices
-    resourceNames:
-      - v1beta1.networking.antrea.tanzu.vmware.com
-      - v1beta1.controlplane.antrea.tanzu.vmware.com
-      - v1alpha1.stats.antrea.tanzu.vmware.com
-      - v1beta1.system.antrea.tanzu.vmware.com
-      - v1beta2.controlplane.antrea.tanzu.vmware.com
-    verbs:
-      - delete
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -6556,18 +6556,6 @@ rules:
     verbs:
       - list
       - update
-  - apiGroups:
-      - apiregistration.k8s.io
-    resources:
-      - apiservices
-    resourceNames:
-      - v1beta1.networking.antrea.tanzu.vmware.com
-      - v1beta1.controlplane.antrea.tanzu.vmware.com
-      - v1alpha1.stats.antrea.tanzu.vmware.com
-      - v1beta1.system.antrea.tanzu.vmware.com
-      - v1beta2.controlplane.antrea.tanzu.vmware.com
-    verbs:
-      - delete
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -6556,18 +6556,6 @@ rules:
     verbs:
       - list
       - update
-  - apiGroups:
-      - apiregistration.k8s.io
-    resources:
-      - apiservices
-    resourceNames:
-      - v1beta1.networking.antrea.tanzu.vmware.com
-      - v1beta1.controlplane.antrea.tanzu.vmware.com
-      - v1alpha1.stats.antrea.tanzu.vmware.com
-      - v1beta1.system.antrea.tanzu.vmware.com
-      - v1beta2.controlplane.antrea.tanzu.vmware.com
-    verbs:
-      - delete
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -6569,18 +6569,6 @@ rules:
     verbs:
       - list
       - update
-  - apiGroups:
-      - apiregistration.k8s.io
-    resources:
-      - apiservices
-    resourceNames:
-      - v1beta1.networking.antrea.tanzu.vmware.com
-      - v1beta1.controlplane.antrea.tanzu.vmware.com
-      - v1alpha1.stats.antrea.tanzu.vmware.com
-      - v1beta1.system.antrea.tanzu.vmware.com
-      - v1beta2.controlplane.antrea.tanzu.vmware.com
-    verbs:
-      - delete
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -6556,18 +6556,6 @@ rules:
     verbs:
       - list
       - update
-  - apiGroups:
-      - apiregistration.k8s.io
-    resources:
-      - apiservices
-    resourceNames:
-      - v1beta1.networking.antrea.tanzu.vmware.com
-      - v1beta1.controlplane.antrea.tanzu.vmware.com
-      - v1alpha1.stats.antrea.tanzu.vmware.com
-      - v1beta1.system.antrea.tanzu.vmware.com
-      - v1beta2.controlplane.antrea.tanzu.vmware.com
-    verbs:
-      - delete
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
@@ -277,13 +277,7 @@ func CleanupDeprecatedAPIServices(aggregatorClient clientset.Interface) error {
 	// deprecates a registered APIService, the APIService should be deleted,
 	// otherwise K8s will fail to delete an existing Namespace.
 	// Also check: https://github.com/antrea-io/antrea/issues/494
-	deprecatedAPIServices := []string{
-		"v1beta1.networking.antrea.tanzu.vmware.com",
-		"v1beta1.controlplane.antrea.tanzu.vmware.com",
-		"v1alpha1.stats.antrea.tanzu.vmware.com",
-		"v1beta1.system.antrea.tanzu.vmware.com",
-		"v1beta2.controlplane.antrea.tanzu.vmware.com",
-	}
+	deprecatedAPIServices := []string{}
 	for _, as := range deprecatedAPIServices {
 		err := aggregatorClient.ApiregistrationV1().APIServices().Delete(context.TODO(), as, metav1.DeleteOptions{})
 		if err == nil {