Skip to content

Commit 156c7b5

Browse files
committed
Update bundle
Update bundle with latest version Signed-off-by: liornoy <lnoy@redhat.com>
1 parent 8fae544 commit 156c7b5

File tree

5 files changed

+73
-54
lines changed

5 files changed

+73
-54
lines changed

bundle.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=metallb-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
9-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.8.0+git
9+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.26.1
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2
1212

bundle/manifests/controller_v1_serviceaccount.yaml

-7
This file was deleted.

bundle/manifests/metallb-operator.clusterserviceversion.yaml

+50-45
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,9 @@ metadata:
273273
categories: Networking
274274
certified: "false"
275275
containerImage: quay.io/metallb/metallb-operator
276-
createdAt: "2021-06-28 00:00:00"
276+
createdAt: "2023-03-07T21:15:23Z"
277277
description: An operator for deploying MetalLB on a kubernetes cluster.
278-
operators.operatorframework.io/builder: operator-sdk-v1.8.0+git
278+
operators.operatorframework.io/builder: operator-sdk-v1.26.1
279279
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
280280
repository: https://github.com/metallb/metallb-operator
281281
support: Community
@@ -572,7 +572,9 @@ spec:
572572
- use
573573
serviceAccountName: speaker
574574
deployments:
575-
- name: metallb-operator-controller-manager
575+
- label:
576+
control-plane: controller-manager
577+
name: metallb-operator-controller-manager
576578
spec:
577579
replicas: 1
578580
selector:
@@ -636,7 +638,10 @@ spec:
636638
secret:
637639
defaultMode: 420
638640
secretName: metallb-operator-webhook-server-cert
639-
- name: metallb-operator-webhook-server
641+
- label:
642+
app: metallb
643+
component: webhook-server
644+
name: metallb-operator-webhook-server
640645
spec:
641646
revisionHistoryLimit: 3
642647
selector:
@@ -960,9 +965,9 @@ spec:
960965
- admissionReviewVersions:
961966
- v1
962967
containerPort: 443
963-
deploymentName: metallb-operator-controller-manager
968+
deploymentName: metallb-operator-webhook-server
964969
failurePolicy: Fail
965-
generateName: metallbvalidationwebhook.metallb.io
970+
generateName: addresspoolvalidationwebhook.metallb.io
966971
rules:
967972
- apiGroups:
968973
- metallb.io
@@ -972,37 +977,37 @@ spec:
972977
- CREATE
973978
- UPDATE
974979
resources:
975-
- metallbs
980+
- addresspools
976981
sideEffects: None
977982
targetPort: 9443
978983
type: ValidatingAdmissionWebhook
979-
webhookPath: /validate-metallb-io-v1beta1-metallb
984+
webhookPath: /validate-metallb-io-v1beta1-addresspool
980985
- admissionReviewVersions:
981986
- v1
982987
containerPort: 443
983988
deploymentName: metallb-operator-webhook-server
984989
failurePolicy: Fail
985-
generateName: bgppeersvalidationwebhook.metallb.io
990+
generateName: bfdprofilevalidationwebhook.metallb.io
986991
rules:
987992
- apiGroups:
988993
- metallb.io
989994
apiVersions:
990-
- v1beta2
995+
- v1beta1
991996
operations:
992997
- CREATE
993-
- UPDATE
998+
- DELETE
994999
resources:
995-
- bgppeers
1000+
- bfdprofiles
9961001
sideEffects: None
9971002
targetPort: 9443
9981003
type: ValidatingAdmissionWebhook
999-
webhookPath: /validate-metallb-io-v1beta2-bgppeer
1004+
webhookPath: /validate-metallb-io-v1beta1-bfdprofile
10001005
- admissionReviewVersions:
10011006
- v1
10021007
containerPort: 443
10031008
deploymentName: metallb-operator-webhook-server
10041009
failurePolicy: Fail
1005-
generateName: addresspoolvalidationwebhook.metallb.io
1010+
generateName: bgpadvertisementvalidationwebhook.metallb.io
10061011
rules:
10071012
- apiGroups:
10081013
- metallb.io
@@ -1012,51 +1017,44 @@ spec:
10121017
- CREATE
10131018
- UPDATE
10141019
resources:
1015-
- addresspools
1020+
- bgpadvertisements
10161021
sideEffects: None
10171022
targetPort: 9443
10181023
type: ValidatingAdmissionWebhook
1019-
webhookPath: /validate-metallb-io-v1beta1-addresspool
1024+
webhookPath: /validate-metallb-io-v1beta1-bgpadvertisement
10201025
- admissionReviewVersions:
10211026
- v1
10221027
containerPort: 443
10231028
deploymentName: metallb-operator-webhook-server
10241029
failurePolicy: Fail
1025-
generateName: bfdprofilevalidationwebhook.metallb.io
1030+
generateName: bgppeersvalidationwebhook.metallb.io
10261031
rules:
10271032
- apiGroups:
10281033
- metallb.io
10291034
apiVersions:
1030-
- v1beta1
1035+
- v1beta2
10311036
operations:
10321037
- CREATE
1033-
- DELETE
1038+
- UPDATE
10341039
resources:
1035-
- bfdprofiles
1040+
- bgppeers
10361041
sideEffects: None
10371042
targetPort: 9443
10381043
type: ValidatingAdmissionWebhook
1039-
webhookPath: /validate-metallb-io-v1beta1-bfdprofile
1044+
webhookPath: /validate-metallb-io-v1beta2-bgppeer
10401045
- admissionReviewVersions:
1041-
- v1
1046+
- v1alpha1
1047+
- v1beta1
10421048
containerPort: 443
1049+
conversionCRDs:
1050+
- addresspools.metallb.io
1051+
- bgppeers.metallb.io
10431052
deploymentName: metallb-operator-webhook-server
1044-
failurePolicy: Fail
1045-
generateName: bgpadvertisementvalidationwebhook.metallb.io
1046-
rules:
1047-
- apiGroups:
1048-
- metallb.io
1049-
apiVersions:
1050-
- v1beta1
1051-
operations:
1052-
- CREATE
1053-
- UPDATE
1054-
resources:
1055-
- bgpadvertisements
1053+
generateName: caddresspoolsbgppeers.kb.io
10561054
sideEffects: None
10571055
targetPort: 9443
1058-
type: ValidatingAdmissionWebhook
1059-
webhookPath: /validate-metallb-io-v1beta1-bgpadvertisement
1056+
type: ConversionWebhook
1057+
webhookPath: /convert
10601058
- admissionReviewVersions:
10611059
- v1
10621060
containerPort: 443
@@ -1118,15 +1116,22 @@ spec:
11181116
type: ValidatingAdmissionWebhook
11191117
webhookPath: /validate-metallb-io-v1beta1-l2advertisement
11201118
- admissionReviewVersions:
1121-
- v1alpha1
1122-
- v1beta1
1119+
- v1
11231120
containerPort: 443
1124-
conversionCRDs:
1125-
- addresspools.metallb.io
1126-
- bgppeers.metallb.io
1127-
deploymentName: metallb-operator-webhook-server
1128-
generateName: caddresspoolsbgppeers.kb.io
1121+
deploymentName: metallb-operator-controller-manager
1122+
failurePolicy: Fail
1123+
generateName: metallbvalidationwebhook.metallb.io
1124+
rules:
1125+
- apiGroups:
1126+
- metallb.io
1127+
apiVersions:
1128+
- v1beta1
1129+
operations:
1130+
- CREATE
1131+
- UPDATE
1132+
resources:
1133+
- metallbs
11291134
sideEffects: None
11301135
targetPort: 9443
1131-
type: ConversionWebhook
1132-
webhookPath: /convert
1136+
type: ValidatingAdmissionWebhook
1137+
webhookPath: /validate-metallb-io-v1beta1-metallb

bundle/metadata/annotations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ annotations:
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: metallb-operator
77
operators.operatorframework.io.bundle.channels.v1: alpha
8-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.8.0+git
8+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.26.1
99
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1010
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2
1111

bundle/tests/scorecard/config.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,59 @@ stages:
1212
labels:
1313
suite: basic
1414
test: basic-check-spec-test
15+
storage:
16+
spec:
17+
mountPath: {}
1518
- entrypoint:
1619
- scorecard-test
1720
- olm-bundle-validation
1821
image: quay.io/operator-framework/scorecard-test:master
1922
labels:
2023
suite: olm
2124
test: olm-bundle-validation-test
25+
storage:
26+
spec:
27+
mountPath: {}
2228
- entrypoint:
2329
- scorecard-test
2430
- olm-crds-have-validation
2531
image: quay.io/operator-framework/scorecard-test:master
2632
labels:
2733
suite: olm
2834
test: olm-crds-have-validation-test
35+
storage:
36+
spec:
37+
mountPath: {}
2938
- entrypoint:
3039
- scorecard-test
3140
- olm-crds-have-resources
3241
image: quay.io/operator-framework/scorecard-test:master
3342
labels:
3443
suite: olm
3544
test: olm-crds-have-resources-test
45+
storage:
46+
spec:
47+
mountPath: {}
3648
- entrypoint:
3749
- scorecard-test
3850
- olm-spec-descriptors
3951
image: quay.io/operator-framework/scorecard-test:master
4052
labels:
4153
suite: olm
4254
test: olm-spec-descriptors-test
55+
storage:
56+
spec:
57+
mountPath: {}
4358
- entrypoint:
4459
- scorecard-test
4560
- olm-status-descriptors
4661
image: quay.io/operator-framework/scorecard-test:master
4762
labels:
4863
suite: olm
4964
test: olm-status-descriptors-test
65+
storage:
66+
spec:
67+
mountPath: {}
68+
storage:
69+
spec:
70+
mountPath: {}

0 commit comments

Comments
 (0)