From 9be4ec260266fcd91a5e177a882fb2723968195b Mon Sep 17 00:00:00 2001 From: Quan Tian Date: Wed, 21 Feb 2024 09:53:30 +0800 Subject: [PATCH] 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 --- .../antrea/templates/controller/clusterrole.yaml | 12 ------------ build/yamls/antrea-aks.yml | 12 ------------ build/yamls/antrea-eks.yml | 12 ------------ build/yamls/antrea-gke.yml | 12 ------------ build/yamls/antrea-ipsec.yml | 12 ------------ build/yamls/antrea.yml | 12 ------------ pkg/apiserver/apiserver.go | 8 +------- 7 files changed, 1 insertion(+), 79 deletions(-) diff --git a/build/charts/antrea/templates/controller/clusterrole.yaml b/build/charts/antrea/templates/controller/clusterrole.yaml index 26a1e4934bf..e81fcce1ad2 100644 --- 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 index 3544639bdcf..155d2016690 100644 --- 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 index 8315fa674d5..3775ab5a638 100644 --- 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 index 59419645f6b..d8be7ff47f5 100644 --- 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 index a392bc59837..5d77441ce72 100644 --- 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 index 6d4b60aebd9..411ec97391f 100644 --- 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 index 199dd0a12fe..b5d8787ffaa 100644 --- 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 {