diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml index e8b640978..583272364 100644 --- a/bin/metallb-operator.yaml +++ b/bin/metallb-operator.yaml @@ -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: @@ -4700,7 +4702,6 @@ rules: - metallb-webhook-configuration resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - create - delete @@ -4713,7 +4714,6 @@ rules: - admissionregistration.k8s.io resources: - validatingwebhookconfigurations - - mutatingwebhookconfigurations verbs: - list - watch 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/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml index 4716ebbbb..b27713213 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-09-10T17:05:22Z" 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 diff --git a/bundle/manifests/metallb.io_bgppeers.yaml b/bundle/manifests/metallb.io_bgppeers.yaml index f2dcd0945..4dea50b72 100644 --- a/bundle/manifests/metallb.io_bgppeers.yaml +++ b/bundle/manifests/metallb.io_bgppeers.yaml @@ -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/config/crd/bases/metallb.io_bgppeers.yaml b/config/crd/bases/metallb.io_bgppeers.yaml index e533f0a26..236e6957f 100644 --- a/config/crd/bases/metallb.io_bgppeers.yaml +++ b/config/crd/bases/metallb.io_bgppeers.yaml @@ -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/metallb_rbac/metallb.yaml b/config/metallb_rbac/metallb.yaml index 48dfa4196..bd60704d1 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 diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt index 240e7e9c8..da0efca2c 100644 --- a/hack/metallb_ref.txt +++ b/hack/metallb_ref.txt @@ -1 +1 @@ -417f016c4870f6c90b66c935ea97e1706d51dd86 +c2cc7aa44b94ffd36ea230ebfe283a673c1a51bb 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/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",