From a80630b30330b7c40911815ae74475ef06a108cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 1 Oct 2024 17:06:24 +0000 Subject: [PATCH] Bump MetalLB This commit bumps MetalLB: from: 417f016c4870f6c90b66c935ea97e1706d51dd86 Bump frrk8s to 0.0.14 (2024-07-19) to: fc863ccd3b12e2eaac5d7d078bbfd833836bce36 Service annotations: change annotation prefix to metallb.io (2024-10-01) Signed-off-by: github-actions[bot] --- bin/metallb-operator.yaml | 38 ++++++++++++------- bindata/deployment/helm/frr-k8s/Chart.lock | 6 +-- bindata/deployment/helm/frr-k8s/Chart.yaml | 4 +- bindata/deployment/helm/frr-k8s/README.md | 4 +- bindata/deployment/helm/metallb/Chart.lock | 6 +-- bindata/deployment/helm/metallb/README.md | 2 +- .../helm/metallb/templates/controller.yaml | 2 +- .../helm/metallb/templates/podmonitor.yaml | 2 + .../metallb/templates/servicemonitor.yaml | 3 +- bindata/deployment/helm/metallb/values.yaml | 6 +-- .../frrk8s.metallb.io_frrconfigurations.yaml | 17 +++++++-- ...etallb-operator.clusterserviceversion.yaml | 7 ++-- bundle/manifests/metallb.io_bfdprofiles.yaml | 2 +- .../metallb.io_bgpadvertisements.yaml | 2 +- bundle/manifests/metallb.io_bgppeers.yaml | 4 +- bundle/manifests/metallb.io_communities.yaml | 2 +- .../manifests/metallb.io_ipaddresspools.yaml | 2 +- .../metallb.io_l2advertisements.yaml | 2 +- .../metallb.io_servicel2statuses.yaml | 2 +- .../frrk8s.metallb.io_frrconfigurations.yaml | 17 +++++++-- config/crd/bases/metallb.io_bfdprofiles.yaml | 2 +- .../bases/metallb.io_bgpadvertisements.yaml | 2 +- config/crd/bases/metallb.io_bgppeers.yaml | 4 +- config/crd/bases/metallb.io_communities.yaml | 2 +- .../crd/bases/metallb.io_ipaddresspools.yaml | 2 +- .../bases/metallb.io_l2advertisements.yaml | 2 +- .../bases/metallb.io_servicel2statuses.yaml | 2 +- config/manager/env.yaml | 2 +- config/metallb_rbac/metallb.yaml | 3 +- hack/metallb_ref.txt | 2 +- .../ocp-metrics-controller-monitor.golden | 1 - .../ocp-metrics-frr-k8s-daemon.golden | 4 +- .../ocp-metrics-frr-k8s-monitor.golden | 4 +- .../ocp-metrics-frr-k8s-webhook.golden | 4 +- .../vanilla-metrics-controller-monitor.golden | 1 - 35 files changed, 102 insertions(+), 65 deletions(-) diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml index e8b640978..751baf492 100644 --- a/bin/metallb-operator.yaml +++ b/bin/metallb-operator.yaml @@ -9,7 +9,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: bfdprofiles.metallb.io spec: group: metallb.io @@ -130,7 +130,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: bgpadvertisements.metallb.io spec: group: metallb.io @@ -347,7 +347,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: bgppeers.metallb.io spec: conversion: @@ -383,6 +383,8 @@ spec: - jsonPath: .spec.ebgpMultiHop name: Multi Hops type: string + deprecated: true + deprecationWarning: v1beta1 is deprecated, please use v1beta2 name: v1beta1 schema: openAPIV3Schema: @@ -695,7 +697,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: communities.metallb.io spec: group: metallb.io @@ -913,8 +915,9 @@ spec: the session with. type: string asn: - description: ASN is the AS number to use for the local - end of the session. + description: |- + ASN is the AS number to use for the local end of the session. + ASN and DynamicASN are mutually exclusive and one of them must be specified. format: int32 maximum: 4294967295 minimum: 0 @@ -944,6 +947,17 @@ spec: will separate IPv4 and IPv6 route exchanges into distinct BGP sessions. type: boolean + dynamicASN: + description: |- + DynamicASN detects the AS number to use for the local end of the session + without explicitly setting it via the ASN field. Limited to: + internal - if the neighbor's ASN is different than the router's the connection is denied. + external - if the neighbor's ASN is the same as the router's the connection is denied. + ASN and DynamicASN are mutually exclusive and one of them must be specified. + enum: + - internal + - external + type: string ebgpMultiHop: description: EBGPMultiHop indicates if the BGPPeer is multi-hops away. @@ -1123,7 +1137,6 @@ spec: type: object required: - address - - asn type: object type: array prefixes: @@ -1287,7 +1300,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: ipaddresspools.metallb.io spec: group: metallb.io @@ -1503,7 +1516,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: l2advertisements.metallb.io spec: group: metallb.io @@ -3627,7 +3640,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: servicel2statuses.metallb.io spec: group: metallb.io @@ -3999,7 +4012,7 @@ spec: - name: DEPLOY_KUBE_RBAC_PROXIES value: "false" - name: FRRK8S_IMAGE - value: quay.io/metallb/frr-k8s:v0.0.14 + value: quay.io/metallb/frr-k8s:v0.0.15 - name: FRRK8S_EXTERNAL_NAMESPACE value: frr-k8s-system - name: OPERATOR_NAMESPACE @@ -4700,7 +4713,6 @@ rules: - metallb-webhook-configuration resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - create - delete @@ -4713,7 +4725,6 @@ rules: - admissionregistration.k8s.io resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - list - watch @@ -4761,6 +4772,7 @@ rules: - watch - create - update + - delete - apiGroups: - metallb.io resources: diff --git a/bindata/deployment/helm/frr-k8s/Chart.lock b/bindata/deployment/helm/frr-k8s/Chart.lock index dafe16503..4e124f075 100644 --- a/bindata/deployment/helm/frr-k8s/Chart.lock +++ b/bindata/deployment/helm/frr-k8s/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: crds repository: "" - version: 0.0.14 -digest: sha256:b8b8aa510f86db5713e75b0bc5a03df88737a5f6868aab77c513eb0bbed3b8b7 -generated: "2024-07-19T12:07:59.737645816+02:00" + version: 0.0.15 +digest: sha256:7c9dcf2405fb90e548b7f8c593065648385092794431b2dcb8288d957aacad2e +generated: "2024-09-17T14:17:43.040895+03:00" diff --git a/bindata/deployment/helm/frr-k8s/Chart.yaml b/bindata/deployment/helm/frr-k8s/Chart.yaml index 93d51afb7..2714f296d 100644 --- a/bindata/deployment/helm/frr-k8s/Chart.yaml +++ b/bindata/deployment/helm/frr-k8s/Chart.yaml @@ -22,9 +22,9 @@ kubeVersion: ">= 1.19.0-0" # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) # NOTE: this value is updated by the frrk8s release process -version: 0.0.14 +version: 0.0.15 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # NOTE: this value is updated by the frrk8s release process -appVersion: v0.0.14 +appVersion: v0.0.15 diff --git a/bindata/deployment/helm/frr-k8s/README.md b/bindata/deployment/helm/frr-k8s/README.md index aa5b74ebe..2f6d38c5e 100644 --- a/bindata/deployment/helm/frr-k8s/README.md +++ b/bindata/deployment/helm/frr-k8s/README.md @@ -1,6 +1,6 @@ # frr-k8s -![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.14](https://img.shields.io/badge/AppVersion-v0.0.14-informational?style=flat-square) +![Version: 0.0.15](https://img.shields.io/badge/Version-0.0.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.15](https://img.shields.io/badge/AppVersion-v0.0.15-informational?style=flat-square) A cloud native wrapper of FRR @@ -16,7 +16,7 @@ Kubernetes: `>= 1.19.0-0` | Repository | Name | Version | |------------|------|---------| -| | crds | 0.0.14 | +| | crds | 0.0.15 | ## Values diff --git a/bindata/deployment/helm/metallb/Chart.lock b/bindata/deployment/helm/metallb/Chart.lock index ce69b56be..fa300eba0 100644 --- a/bindata/deployment/helm/metallb/Chart.lock +++ b/bindata/deployment/helm/metallb/Chart.lock @@ -4,6 +4,6 @@ dependencies: version: 0.0.0 - name: frr-k8s repository: https://metallb.github.io/frr-k8s - version: 0.0.14 -digest: sha256:727b303ca5008e171345d7a257142f2fc2e68d14b3e04a1176c7434501af8200 -generated: "2024-07-19T12:19:14.171245879+02:00" + version: 0.0.15 +digest: sha256:2300c788e6c8f7d5f3b51ba37b20ed00b9e949c16f5aff880977703ac154f75f +generated: "2024-09-17T15:14:34.977441+03:00" diff --git a/bindata/deployment/helm/metallb/README.md b/bindata/deployment/helm/metallb/README.md index 202a95195..add286f43 100644 --- a/bindata/deployment/helm/metallb/README.md +++ b/bindata/deployment/helm/metallb/README.md @@ -17,7 +17,7 @@ Kubernetes: `>= 1.19.0-0` | Repository | Name | Version | |------------|------|---------| | | crds | 0.0.0 | -| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.14 | +| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.15 | ## Values diff --git a/bindata/deployment/helm/metallb/templates/controller.yaml b/bindata/deployment/helm/metallb/templates/controller.yaml index 6f1ecc8b1..c751f5d96 100644 --- a/bindata/deployment/helm/metallb/templates/controller.yaml +++ b/bindata/deployment/helm/metallb/templates/controller.yaml @@ -84,7 +84,7 @@ spec: - name: METALLB_DEPLOYMENT value: controller {{- end }} - {{- if .Values.speaker.frr.enabled }} + {{- if and .Values.speaker.enabled .Values.speaker.frr.enabled }} - name: METALLB_BGP_TYPE value: frr {{- end }} diff --git a/bindata/deployment/helm/metallb/templates/podmonitor.yaml b/bindata/deployment/helm/metallb/templates/podmonitor.yaml index 231d16020..b977276eb 100644 --- a/bindata/deployment/helm/metallb/templates/podmonitor.yaml +++ b/bindata/deployment/helm/metallb/templates/podmonitor.yaml @@ -36,6 +36,7 @@ spec: relabelings: {{- toYaml .Values.prometheus.podMonitor.relabelings | nindent 4 }} {{- end }} +{{- if .Values.speaker.enabled }} --- apiVersion: monitoring.coreos.com/v1 kind: PodMonitor @@ -74,6 +75,7 @@ spec: relabelings: {{- toYaml .Values.prometheus.podMonitor.relabelings | nindent 4 }} {{- end }} +{{- end }} --- {{- if .Values.prometheus.rbacPrometheus }} apiVersion: rbac.authorization.k8s.io/v1 diff --git a/bindata/deployment/helm/metallb/templates/servicemonitor.yaml b/bindata/deployment/helm/metallb/templates/servicemonitor.yaml index 0a93fa876..5dac9e11c 100644 --- a/bindata/deployment/helm/metallb/templates/servicemonitor.yaml +++ b/bindata/deployment/helm/metallb/templates/servicemonitor.yaml @@ -1,4 +1,5 @@ {{- if .Values.prometheus.serviceMonitor.enabled }} +{{- if .Values.speaker.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: @@ -89,6 +90,7 @@ spec: {{- end }} sessionAffinity: None type: ClusterIP +{{- end }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -97,7 +99,6 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "metallb.labels" . | nindent 4 }} - component: speaker {{- if .Values.prometheus.serviceMonitor.controller.additionalLabels }} {{ toYaml .Values.prometheus.serviceMonitor.controller.additionalLabels | indent 4 }} {{- end }} diff --git a/bindata/deployment/helm/metallb/values.yaml b/bindata/deployment/helm/metallb/values.yaml index bc96d3550..bcb5d88a6 100644 --- a/bindata/deployment/helm/metallb/values.yaml +++ b/bindata/deployment/helm/metallb/values.yaml @@ -42,7 +42,7 @@ prometheus: # certificate to be used. controllerMetricsTLSSecret: "" - # prometheus doens't have the permission to scrape all namespaces so we give it permission to scrape metallb's one + # prometheus doesn't have the permission to scrape all namespaces so we give it permission to scrape metallb's one rbacPrometheus: true # the service account used by prometheus @@ -64,7 +64,7 @@ prometheus: # enable support for Prometheus Operator enabled: false - # optional additionnal labels for podMonitors + # optional additional labels for podMonitors additionalLabels: {} # optional annotations for podMonitors @@ -143,7 +143,7 @@ prometheus: # enable alertmanager alerts enabled: false - # optional additionnal labels for prometheusRules + # optional additional labels for prometheusRules additionalLabels: {} # optional annotations for prometheusRules diff --git a/bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml b/bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml index 285121ace..4bffe9ec8 100644 --- a/bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml +++ b/bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml @@ -156,8 +156,9 @@ spec: the session with. type: string asn: - description: ASN is the AS number to use for the local - end of the session. + description: |- + ASN is the AS number to use for the local end of the session. + ASN and DynamicASN are mutually exclusive and one of them must be specified. format: int32 maximum: 4294967295 minimum: 0 @@ -187,6 +188,17 @@ spec: will separate IPv4 and IPv6 route exchanges into distinct BGP sessions. type: boolean + dynamicASN: + description: |- + DynamicASN detects the AS number to use for the local end of the session + without explicitly setting it via the ASN field. Limited to: + internal - if the neighbor's ASN is different than the router's the connection is denied. + external - if the neighbor's ASN is the same as the router's the connection is denied. + ASN and DynamicASN are mutually exclusive and one of them must be specified. + enum: + - internal + - external + type: string ebgpMultiHop: description: EBGPMultiHop indicates if the BGPPeer is multi-hops away. @@ -366,7 +378,6 @@ spec: type: object required: - address - - asn type: object type: array prefixes: diff --git a/bundle/manifests/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml index 4716ebbbb..b6994a69a 100644 --- a/bundle/manifests/metallb-operator.clusterserviceversion.yaml +++ b/bundle/manifests/metallb-operator.clusterserviceversion.yaml @@ -432,7 +432,7 @@ metadata: categories: Networking certified: "false" containerImage: quay.io/metallb/metallb-operator - createdAt: "2024-07-22T10:18:02Z" + createdAt: "2024-10-01T17:05:21Z" description: An operator for deploying MetalLB on a kubernetes cluster. operators.operatorframework.io/builder: operator-sdk-v1.34.1 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 @@ -547,7 +547,6 @@ spec: - metallb-webhook-configuration resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - create - delete @@ -560,7 +559,6 @@ spec: - admissionregistration.k8s.io resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - list - watch @@ -814,6 +812,7 @@ spec: - watch - create - update + - delete - apiGroups: - metallb.io resources: @@ -891,7 +890,7 @@ spec: - name: DEPLOY_KUBE_RBAC_PROXIES value: "false" - name: FRRK8S_IMAGE - value: quay.io/metallb/frr-k8s:v0.0.14 + value: quay.io/metallb/frr-k8s:v0.0.15 - name: FRRK8S_EXTERNAL_NAMESPACE value: frr-k8s-system - name: OPERATOR_NAMESPACE diff --git a/bundle/manifests/metallb.io_bfdprofiles.yaml b/bundle/manifests/metallb.io_bfdprofiles.yaml index 2edb6afc8..50f937296 100644 --- a/bundle/manifests/metallb.io_bfdprofiles.yaml +++ b/bundle/manifests/metallb.io_bfdprofiles.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 creationTimestamp: null name: bfdprofiles.metallb.io spec: diff --git a/bundle/manifests/metallb.io_bgpadvertisements.yaml b/bundle/manifests/metallb.io_bgpadvertisements.yaml index 088cf0129..e5caa44de 100644 --- a/bundle/manifests/metallb.io_bgpadvertisements.yaml +++ b/bundle/manifests/metallb.io_bgpadvertisements.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 creationTimestamp: null name: bgpadvertisements.metallb.io spec: diff --git a/bundle/manifests/metallb.io_bgppeers.yaml b/bundle/manifests/metallb.io_bgppeers.yaml index f2dcd0945..221388229 100644 --- a/bundle/manifests/metallb.io_bgppeers.yaml +++ b/bundle/manifests/metallb.io_bgppeers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 creationTimestamp: null name: bgppeers.metallb.io spec: @@ -39,6 +39,8 @@ spec: - jsonPath: .spec.ebgpMultiHop name: Multi Hops type: string + deprecated: true + deprecationWarning: v1beta1 is deprecated, please use v1beta2 name: v1beta1 schema: openAPIV3Schema: diff --git a/bundle/manifests/metallb.io_communities.yaml b/bundle/manifests/metallb.io_communities.yaml index b4b40f81d..17766287b 100644 --- a/bundle/manifests/metallb.io_communities.yaml +++ b/bundle/manifests/metallb.io_communities.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 creationTimestamp: null name: communities.metallb.io spec: diff --git a/bundle/manifests/metallb.io_ipaddresspools.yaml b/bundle/manifests/metallb.io_ipaddresspools.yaml index 9e8b7a1f3..a198487ec 100644 --- a/bundle/manifests/metallb.io_ipaddresspools.yaml +++ b/bundle/manifests/metallb.io_ipaddresspools.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 creationTimestamp: null name: ipaddresspools.metallb.io spec: diff --git a/bundle/manifests/metallb.io_l2advertisements.yaml b/bundle/manifests/metallb.io_l2advertisements.yaml index e5a80e30c..3312427e3 100644 --- a/bundle/manifests/metallb.io_l2advertisements.yaml +++ b/bundle/manifests/metallb.io_l2advertisements.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 creationTimestamp: null name: l2advertisements.metallb.io spec: diff --git a/bundle/manifests/metallb.io_servicel2statuses.yaml b/bundle/manifests/metallb.io_servicel2statuses.yaml index b9d0527c6..d82e5e8ce 100644 --- a/bundle/manifests/metallb.io_servicel2statuses.yaml +++ b/bundle/manifests/metallb.io_servicel2statuses.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 creationTimestamp: null name: servicel2statuses.metallb.io spec: diff --git a/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml b/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml index d91d55022..98a661e3b 100644 --- a/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml +++ b/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml @@ -155,8 +155,9 @@ spec: the session with. type: string asn: - description: ASN is the AS number to use for the local - end of the session. + description: |- + ASN is the AS number to use for the local end of the session. + ASN and DynamicASN are mutually exclusive and one of them must be specified. format: int32 maximum: 4294967295 minimum: 0 @@ -186,6 +187,17 @@ spec: will separate IPv4 and IPv6 route exchanges into distinct BGP sessions. type: boolean + dynamicASN: + description: |- + DynamicASN detects the AS number to use for the local end of the session + without explicitly setting it via the ASN field. Limited to: + internal - if the neighbor's ASN is different than the router's the connection is denied. + external - if the neighbor's ASN is the same as the router's the connection is denied. + ASN and DynamicASN are mutually exclusive and one of them must be specified. + enum: + - internal + - external + type: string ebgpMultiHop: description: EBGPMultiHop indicates if the BGPPeer is multi-hops away. @@ -365,7 +377,6 @@ spec: type: object required: - address - - asn type: object type: array prefixes: diff --git a/config/crd/bases/metallb.io_bfdprofiles.yaml b/config/crd/bases/metallb.io_bfdprofiles.yaml index cdadd930d..3671debab 100644 --- a/config/crd/bases/metallb.io_bfdprofiles.yaml +++ b/config/crd/bases/metallb.io_bfdprofiles.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: bfdprofiles.metallb.io spec: group: metallb.io diff --git a/config/crd/bases/metallb.io_bgpadvertisements.yaml b/config/crd/bases/metallb.io_bgpadvertisements.yaml index 55ed92103..214f04999 100644 --- a/config/crd/bases/metallb.io_bgpadvertisements.yaml +++ b/config/crd/bases/metallb.io_bgpadvertisements.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: bgpadvertisements.metallb.io spec: group: metallb.io diff --git a/config/crd/bases/metallb.io_bgppeers.yaml b/config/crd/bases/metallb.io_bgppeers.yaml index e533f0a26..ed3540cb7 100644 --- a/config/crd/bases/metallb.io_bgppeers.yaml +++ b/config/crd/bases/metallb.io_bgppeers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: bgppeers.metallb.io spec: group: metallb.io @@ -26,6 +26,8 @@ spec: - jsonPath: .spec.ebgpMultiHop name: Multi Hops type: string + deprecated: true + deprecationWarning: v1beta1 is deprecated, please use v1beta2 name: v1beta1 schema: openAPIV3Schema: diff --git a/config/crd/bases/metallb.io_communities.yaml b/config/crd/bases/metallb.io_communities.yaml index 82fd0fd95..117fe7e22 100644 --- a/config/crd/bases/metallb.io_communities.yaml +++ b/config/crd/bases/metallb.io_communities.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: communities.metallb.io spec: group: metallb.io diff --git a/config/crd/bases/metallb.io_ipaddresspools.yaml b/config/crd/bases/metallb.io_ipaddresspools.yaml index 06cba9c95..fb8ac350d 100644 --- a/config/crd/bases/metallb.io_ipaddresspools.yaml +++ b/config/crd/bases/metallb.io_ipaddresspools.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: ipaddresspools.metallb.io spec: group: metallb.io diff --git a/config/crd/bases/metallb.io_l2advertisements.yaml b/config/crd/bases/metallb.io_l2advertisements.yaml index 9273bcb8d..373205d14 100644 --- a/config/crd/bases/metallb.io_l2advertisements.yaml +++ b/config/crd/bases/metallb.io_l2advertisements.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: l2advertisements.metallb.io spec: group: metallb.io diff --git a/config/crd/bases/metallb.io_servicel2statuses.yaml b/config/crd/bases/metallb.io_servicel2statuses.yaml index c5af949ae..e3d8f6aab 100644 --- a/config/crd/bases/metallb.io_servicel2statuses.yaml +++ b/config/crd/bases/metallb.io_servicel2statuses.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: servicel2statuses.metallb.io spec: group: metallb.io diff --git a/config/manager/env.yaml b/config/manager/env.yaml index 5ee1c978a..ec5b3489a 100644 --- a/config/manager/env.yaml +++ b/config/manager/env.yaml @@ -22,6 +22,6 @@ spec: - name: DEPLOY_KUBE_RBAC_PROXIES value: "false" - name: FRRK8S_IMAGE - value: "quay.io/metallb/frr-k8s:v0.0.14" + value: "quay.io/metallb/frr-k8s:v0.0.15" - name: FRRK8S_EXTERNAL_NAMESPACE value: "frr-k8s-system" diff --git a/config/metallb_rbac/metallb.yaml b/config/metallb_rbac/metallb.yaml index 48dfa4196..64e3c6261 100644 --- a/config/metallb_rbac/metallb.yaml +++ b/config/metallb_rbac/metallb.yaml @@ -376,7 +376,6 @@ rules: - metallb-webhook-configuration resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - create - delete @@ -389,7 +388,6 @@ rules: - admissionregistration.k8s.io resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - list - watch @@ -437,6 +435,7 @@ rules: - watch - create - update + - delete - apiGroups: - metallb.io resources: diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt index 240e7e9c8..68a082db7 100644 --- a/hack/metallb_ref.txt +++ b/hack/metallb_ref.txt @@ -1 +1 @@ -417f016c4870f6c90b66c935ea97e1706d51dd86 +fc863ccd3b12e2eaac5d7d078bbfd833836bce36 diff --git a/pkg/helm/testdata/ocp-metrics-controller-monitor.golden b/pkg/helm/testdata/ocp-metrics-controller-monitor.golden index f72912b8e..19cffaad6 100644 --- a/pkg/helm/testdata/ocp-metrics-controller-monitor.golden +++ b/pkg/helm/testdata/ocp-metrics-controller-monitor.golden @@ -9,7 +9,6 @@ "app": "metallb", "app.kubernetes.io/managed-by": "Helm", "app.kubernetes.io/version": "v0.0.0", - "component": "speaker", "helm.sh/chart": "metallb-0.0.0" }, "name": "controller-monitor", diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden index aa9bd5e56..dc9db17a7 100644 --- a/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden +++ b/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden @@ -5,9 +5,9 @@ "labels": { "app": "frr-k8s", "app.kubernetes.io/managed-by": "Helm", - "app.kubernetes.io/version": "v0.0.14", + "app.kubernetes.io/version": "v0.0.15", "component": "frr-k8s", - "helm.sh/chart": "frr-k8s-0.0.14" + "helm.sh/chart": "frr-k8s-0.0.15" }, "name": "frr-k8s", "namespace": "metallb-test-namespace" diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden index ad8d18e68..8d5703de0 100644 --- a/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden +++ b/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden @@ -8,9 +8,9 @@ "labels": { "app": "frr-k8s", "app.kubernetes.io/managed-by": "Helm", - "app.kubernetes.io/version": "v0.0.14", + "app.kubernetes.io/version": "v0.0.15", "component": "frr-k8s", - "helm.sh/chart": "frr-k8s-0.0.14" + "helm.sh/chart": "frr-k8s-0.0.15" }, "name": "frr-k8s-monitor", "namespace": "metallb-test-namespace" diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden index f653b6408..9ac6e039c 100644 --- a/pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden +++ b/pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden @@ -5,9 +5,9 @@ "labels": { "app": "frr-k8s", "app.kubernetes.io/managed-by": "Helm", - "app.kubernetes.io/version": "v0.0.14", + "app.kubernetes.io/version": "v0.0.15", "component": "frr-k8s-webhook-server", - "helm.sh/chart": "frr-k8s-0.0.14" + "helm.sh/chart": "frr-k8s-0.0.15" }, "name": "frr-k8s-webhook-server", "namespace": "metallb-test-namespace" diff --git a/pkg/helm/testdata/vanilla-metrics-controller-monitor.golden b/pkg/helm/testdata/vanilla-metrics-controller-monitor.golden index 1251fb153..ce20e8fc1 100644 --- a/pkg/helm/testdata/vanilla-metrics-controller-monitor.golden +++ b/pkg/helm/testdata/vanilla-metrics-controller-monitor.golden @@ -6,7 +6,6 @@ "app": "metallb", "app.kubernetes.io/managed-by": "Helm", "app.kubernetes.io/version": "v0.0.0", - "component": "speaker", "helm.sh/chart": "metallb-0.0.0" }, "name": "controller-monitor",