Remove the legacy AddressPool - Attempt number 3

We missed a few other spots, hopefully this is the last cleanup. Signed-off-by: Ori Braunshtein <obraunsh@redhat.com>
pperiyasamy · Feb 1, 2024 · 4633b39 · 4633b39
1 parent c3693e5
commit 4633b39
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 181 deletions.
diff --git a/charts/metallb/templates/rbac.yaml b/charts/metallb/templates/rbac.yaml
@@ -27,7 +27,7 @@ rules:
   verbs: ["list", "watch"]
 - apiGroups: ["apiextensions.k8s.io"]
   resources: ["customresourcedefinitions"]
-  resourceNames: ["addresspools.metallb.io","bfdprofiles.metallb.io","bgpadvertisements.metallb.io",
+  resourceNames: ["bfdprofiles.metallb.io","bgpadvertisements.metallb.io",
     "bgppeers.metallb.io","ipaddresspools.metallb.io","l2advertisements.metallb.io","communities.metallb.io"]
   verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
 - apiGroups: ["apiextensions.k8s.io"]
@@ -83,9 +83,6 @@ rules:
 - apiGroups: [""]
   resources: ["configmaps"]
   verbs: ["get", "list", "watch"]
-- apiGroups: ["metallb.io"]
-  resources: ["addresspools"]
-  verbs: ["get", "list", "watch"]
 - apiGroups: ["metallb.io"]
   resources: ["bfdprofiles"]
   verbs: ["get", "list", "watch"]
@@ -133,9 +130,6 @@ rules:
 - apiGroups: [""]
   resources: ["secrets"]
   verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
-- apiGroups: ["metallb.io"]
-  resources: ["addresspools"]
-  verbs: ["get", "list", "watch"]
 - apiGroups: ["metallb.io"]
   resources: ["ipaddresspools"]
   verbs: ["get", "list", "watch"]

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -9,10 +9,6 @@ resources:
 - bases/metallb.io_communities.yaml
 
 patches:
-- path: patches/crd-conversion-patch-addresspools.yaml
-  target:
-    kind: CustomResourceDefinition
-    name: addresspools.metallb.io
 - path: patches/crd-conversion-patch-bgppeers.yaml
   target:
     kind: CustomResourceDefinition

diff --git a/config/crd/patches/crd-conversion-patch-addresspools.yaml b/config/crd/patches/crd-conversion-patch-addresspools.yaml
diff --git a/config/manifests/metallb-frr-k8s-prometheus.yaml b/config/manifests/metallb-frr-k8s-prometheus.yaml
@@ -1619,14 +1619,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1726,14 +1718,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -2000,7 +1984,6 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
-  - addresspools.metallb.io
   - bfdprofiles.metallb.io
   - bgpadvertisements.metallb.io
   - bgppeers.metallb.io

diff --git a/config/manifests/metallb-frr-k8s.yaml b/config/manifests/metallb-frr-k8s.yaml
@@ -1614,14 +1614,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1721,14 +1713,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1966,7 +1950,6 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
-  - addresspools.metallb.io
   - bfdprofiles.metallb.io
   - bgpadvertisements.metallb.io
   - bgppeers.metallb.io

diff --git a/config/manifests/metallb-frr-prometheus.yaml b/config/manifests/metallb-frr-prometheus.yaml
@@ -1136,14 +1136,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1215,14 +1207,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1370,7 +1354,6 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
-  - addresspools.metallb.io
   - bfdprofiles.metallb.io
   - bgpadvertisements.metallb.io
   - bgppeers.metallb.io

diff --git a/config/manifests/metallb-frr.yaml b/config/manifests/metallb-frr.yaml
@@ -1136,14 +1136,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1215,14 +1207,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1341,7 +1325,6 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
-  - addresspools.metallb.io
   - bfdprofiles.metallb.io
   - bgpadvertisements.metallb.io
   - bgppeers.metallb.io

diff --git a/config/manifests/metallb-native-prometheus.yaml b/config/manifests/metallb-native-prometheus.yaml
@@ -1136,14 +1136,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1215,14 +1207,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1370,7 +1354,6 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
-  - addresspools.metallb.io
   - bfdprofiles.metallb.io
   - bgpadvertisements.metallb.io
   - bgppeers.metallb.io

diff --git a/config/manifests/metallb-native.yaml b/config/manifests/metallb-native.yaml
@@ -1136,14 +1136,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1215,14 +1207,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -1341,7 +1325,6 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
-  - addresspools.metallb.io
   - bfdprofiles.metallb.io
   - bgpadvertisements.metallb.io
   - bgppeers.metallb.io

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -69,7 +69,6 @@ rules:
     resources:
       - customresourcedefinitions
     resourceNames:
-      - addresspools.metallb.io
       - bfdprofiles.metallb.io
       - bgpadvertisements.metallb.io
       - bgppeers.metallb.io
@@ -162,14 +161,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - metallb.io
-    resources:
-      - addresspools
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - metallb.io
     resources:
@@ -261,14 +252,6 @@ rules:
     verbs:
       - get
       - list
-  - apiGroups:
-      - metallb.io
-    resources:
-      - addresspools
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - metallb.io
     resources:

diff --git a/config/webhook/patches/webhook_conversion.yaml b/config/webhook/patches/webhook_conversion.yaml
@@ -1,23 +1,5 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
-metadata:
-  name: addresspools.metallb.io
-spec:
-  conversion:
-    strategy: Webhook
-    webhook:
-      conversionReviewVersions: ["v1alpha1", "v1beta1"]
-      clientConfig:
-        # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-        # but we're going to set it later using the cert-controller.
-        caBundle: Cg==
-        service:
-          namespace: metallb-system
-          name: webhook-service
-          path: /convert
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
 metadata:
   name: bgppeers.metallb.io
 spec:

diff --git a/internal/k8s/k8s.go b/internal/k8s/k8s.go
@@ -58,11 +58,10 @@ const (
 )
 
 var (
-	scheme                          = runtime.NewScheme()
-	setupLog                        = ctrl.Log.WithName("setup")
-	validatingWebhookName           = "metallb-webhook-configuration"
-	addresspoolConvertingWebhookCRD = "addresspools.metallb.io"
-	bgppeerConvertingWebhookCRD     = "bgppeers.metallb.io"
+	scheme                      = runtime.NewScheme()
+	setupLog                    = ctrl.Log.WithName("setup")
+	validatingWebhookName       = "metallb-webhook-configuration"
+	bgppeerConvertingWebhookCRD = "bgppeers.metallb.io"
 )
 
 func init() {

diff --git a/internal/k8s/webhook.go b/internal/k8s/webhook.go
@@ -22,10 +22,6 @@ func enableCertRotation(notifyFinished chan struct{}, cfg *Config, mgr manager.M
 			Name: validatingWebhookName,
 			Type: rotator.Validating,
 		},
-		{
-			Name: addresspoolConvertingWebhookCRD,
-			Type: rotator.CRDConversion,
-		},
 		{
 			Name: bgppeerConvertingWebhookCRD,
 			Type: rotator.CRDConversion,

diff --git a/internal/k8s/webhooks/webhookv1beta1/common.go b/internal/k8s/webhooks/webhookv1beta1/common.go
@@ -9,7 +9,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// log is for logging addresspool-webhook.
 var (
 	Logger           log.Logger
 	WebhookClient    client.Reader