From 7ac539d435723196d27b52ab0395f61b037f57ea Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Sat, 19 Feb 2022 11:36:15 +0100 Subject: [PATCH] Bump metallb version to latest --- Makefile | 2 +- .../manifests/metallb-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/env.yaml | 4 ++-- config/manager/kustomization.yaml | 2 +- config/olm-install/install-resources.yaml | 2 +- hack/metallb_version.txt | 2 +- hack/operator_version.txt | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index dd57b85d1..f966aaaba 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ SHELL := /bin/bash # Current Operator version -VERSION ?= latest +VERSION ?= v0.12.0 CSV_VERSION = $(shell echo $(VERSION) | sed 's/v//') ifeq ($(VERSION), latest) CSV_VERSION := 0.0.0 diff --git a/bundle/manifests/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml index d37c2b59d..d7a9a163e 100644 --- a/bundle/manifests/metallb-operator.clusterserviceversion.yaml +++ b/bundle/manifests/metallb-operator.clusterserviceversion.yaml @@ -415,9 +415,9 @@ spec: - /manager env: - name: SPEAKER_IMAGE - value: quay.io/metallb/speaker:main + value: quay.io/metallb/speaker:v0.12.1 - name: CONTROLLER_IMAGE - value: quay.io/metallb/controller:main + value: quay.io/metallb/controller:v0.12.1 - name: ENABLE_OPERATOR_WEBHOOK value: "true" - name: METALLB_BGP_TYPE @@ -434,7 +434,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/metallb/metallb-operator:latest + image: quay.io/metallb/metallb-operator:v0.12.0 name: manager ports: - containerPort: 9443 @@ -593,7 +593,7 @@ spec: maturity: alpha provider: name: Community - version: 0.0.0 + version: 0.12.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/env.yaml b/config/manager/env.yaml index 9bb5a9feb..bf60654bb 100644 --- a/config/manager/env.yaml +++ b/config/manager/env.yaml @@ -10,9 +10,9 @@ spec: - name: manager env: - name: SPEAKER_IMAGE - value: "quay.io/metallb/speaker:main" + value: "quay.io/metallb/speaker:v0.12.1" - name: CONTROLLER_IMAGE - value: "quay.io/metallb/controller:main" + value: "quay.io/metallb/controller:v0.12.1" - name: ENABLE_OPERATOR_WEBHOOK value: "true" - name: METALLB_BGP_TYPE diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 80989fc21..0c6e0d8d0 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -7,4 +7,4 @@ patchesStrategicMerge: images: - name: controller newName: quay.io/metallb/metallb-operator - newTag: latest + newTag: v0.12.0 diff --git a/config/olm-install/install-resources.yaml b/config/olm-install/install-resources.yaml index 05294dfc9..2654eb128 100644 --- a/config/olm-install/install-resources.yaml +++ b/config/olm-install/install-resources.yaml @@ -10,7 +10,7 @@ metadata: namespace: mymetallb spec: displayName: MetalLB Operator Upstream - image: quay.io/metallb/metallb-operator-bundle-index:latest + image: quay.io/metallb/metallb-operator-bundle-index:v0.12.0 publisher: github.com/metallb/metallb-operator sourceType: grpc --- diff --git a/hack/metallb_version.txt b/hack/metallb_version.txt index ba2906d06..9ca265d21 100644 --- a/hack/metallb_version.txt +++ b/hack/metallb_version.txt @@ -1 +1 @@ -main +v0.12.1 diff --git a/hack/operator_version.txt b/hack/operator_version.txt index a0f9a4b4b..87a1cf595 100644 --- a/hack/operator_version.txt +++ b/hack/operator_version.txt @@ -1 +1 @@ -latest +v0.12.0