Bump MetalLB again

Bumping after removing the addresspool leftovers Signed-off-by: Federico Paolinelli <[email protected]>
metallb · Feb 1, 2024 · fee774d · fee774d
1 parent 7292c12
commit fee774d
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 77 deletions.
diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml
@@ -4250,14 +4250,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -4372,14 +4364,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - metallb.io
-  resources:
-  - addresspools
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - metallb.io
   resources:
@@ -4653,7 +4637,6 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
-  - addresspools.metallb.io
   - bfdprofiles.metallb.io
   - bgpadvertisements.metallb.io
   - bgppeers.metallb.io

diff --git a/bundle/manifests/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml
@@ -273,7 +273,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/metallb/metallb-operator
-    createdAt: "2024-01-29T17:07:41Z"
+    createdAt: "2024-02-01T12:58:22Z"
     description: An operator for deploying MetalLB on a kubernetes cluster.
     operators.operatorframework.io/builder: operator-sdk-v1.26.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
@@ -405,7 +405,6 @@ spec:
             - apiGroups:
                 - apiextensions.k8s.io
               resourceNames:
-                - addresspools.metallb.io
                 - bfdprofiles.metallb.io
                 - bgpadvertisements.metallb.io
                 - bgppeers.metallb.io
@@ -845,14 +844,6 @@ spec:
               verbs:
                 - get
                 - list
-            - apiGroups:
-                - metallb.io
-              resources:
-                - addresspools
-              verbs:
-                - get
-                - list
-                - watch
             - apiGroups:
                 - metallb.io
               resources:
@@ -1002,14 +993,6 @@ spec:
                 - get
                 - list
                 - watch
-            - apiGroups:
-                - metallb.io
-              resources:
-                - addresspools
-              verbs:
-                - get
-                - list
-                - watch
             - apiGroups:
                 - metallb.io
               resources:

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -19,10 +19,6 @@ configurations:
   - kustomizeconfig.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/metallb_rbac/metallb.yaml b/config/metallb_rbac/metallb.yaml
@@ -70,14 +70,6 @@ rules:
     verbs:
       - get
       - list
-  - apiGroups:
-      - metallb.io
-    resources:
-      - addresspools
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - metallb.io
     resources:
@@ -177,14 +169,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - metallb.io
-    resources:
-      - addresspools
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - metallb.io
     resources:
@@ -422,7 +406,6 @@ rules:
   - apiGroups:
       - apiextensions.k8s.io
     resourceNames:
-      - addresspools.metallb.io
       - bfdprofiles.metallb.io
       - bgpadvertisements.metallb.io
       - bgppeers.metallb.io

diff --git a/config/webhook/webhook/patches/webhook_conversion.yaml b/config/webhook/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/hack/generate-metallb-manifests.sh b/hack/generate-metallb-manifests.sh
@@ -31,9 +31,8 @@ ls -d "$METALLB_PATH"/config/crd/bases/* | xargs sed -i '/^---$/d'
 ls -d "$METALLB_PATH"/config/crd/bases/* | xargs sed -i '/^$/d'
 ls -d "$FRRK8S_PATH"/config/crd/bases/* | xargs sed -i '/^---$/d'
 ls -d "$FRRK8S_PATH"/config/crd/bases/* | xargs sed -i '/^$/d'
-ls -d config/crd/bases/* | grep -v metallb.io_metallbs | xargs rm 
+ls -d config/crd/bases/* | grep -v metallb.io_metallbs | xargs rm
 cp -r "$METALLB_PATH"/config/crd/bases config/crd
-cp -r "$METALLB_PATH"/config/crd/patches/crd-conversion-patch-addresspools.yaml config/crd/patches
 cp -r "$METALLB_PATH"/config/crd/patches/crd-conversion-patch-bgppeers.yaml config/crd/patches
 cp -r "$METALLB_PATH"/config/webhook config/webhook
 cp -r "$FRRK8S_PATH"/config/crd/bases config/crd

diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt
@@ -1 +1 @@
-70530782c25d3f89b7d7fbc64d2f43750a8234a6
+4633b39e3eb60644eaed1fa2a5eb607ac1531eae
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		70530782c25d3f89b7d7fbc64d2f43750a8234a6
		4633b39e3eb60644eaed1fa2a5eb607ac1531eae