From 82e66923a1ca152c4d50935974a9d979340efbcc Mon Sep 17 00:00:00 2001 From: Guilherme Cassolato Date: Wed, 13 Mar 2024 17:54:44 +0100 Subject: [PATCH 1/2] Upgrade operator-sdk to v1.32.0 --- Makefile | 2 +- bundle.Dockerfile | 2 +- .../manifests/authorino-operator.clusterserviceversion.yaml | 4 ++-- bundle/metadata/annotations.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1597efab..19917fbd 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ help: ## Display this help. ##@ Tools OPERATOR_SDK = $(shell pwd)/bin/operator-sdk -OPERATOR_SDK_VERSION = v1.22.0 +OPERATOR_SDK_VERSION = v1.32.0 operator-sdk: ## Download operator-sdk locally if necessary. ./utils/install-operator-sdk.sh $(OPERATOR_SDK) $(OPERATOR_SDK_VERSION) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 8fe9a64b..d758f920 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=authorino-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/authorino-operator.clusterserviceversion.yaml b/bundle/manifests/authorino-operator.clusterserviceversion.yaml index 61285912..7bded6a6 100644 --- a/bundle/manifests/authorino-operator.clusterserviceversion.yaml +++ b/bundle/manifests/authorino-operator.clusterserviceversion.yaml @@ -83,8 +83,8 @@ metadata: capabilities: Basic Install categories: Integration & Delivery containerImage: quay.io/kuadrant/authorino-operator:latest - createdAt: 2021-12-08T10-00-00Z - operators.operatorframework.io/builder: operator-sdk-v1.22.0 + createdAt: "2024-03-13T16:53:44Z" + operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/Kuadrant/authorino-operator support: kuadrant diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 118a56d0..c045d911 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: authorino-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 From 884cabd12ce10c344d918f55599a4411e098b9d6 Mon Sep 17 00:00:00 2001 From: Guilherme Cassolato Date: Wed, 13 Mar 2024 17:59:39 +0100 Subject: [PATCH 2/2] Ignore csv createdAt for the bundle verification --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 19917fbd..9cd46529 100644 --- a/Makefile +++ b/Makefile @@ -252,9 +252,14 @@ bundle: manifests kustomize operator-sdk $(YQ) ## Generate bundle manifests and V="$(shell $(YQ) e -e '.config.replaces' $(BUILD_CONFIG_FILE))" $(YQ) eval '.spec.replaces = strenv(V)' -i $(BUNDLE_CSV)) || \ ($(YQ) eval '.' -i $(BUNDLE_CSV) && echo "no replaces added") $(OPERATOR_SDK) bundle validate ./bundle + $(MAKE) bundle-ignore-created-at # Roll back edit cd config/manager && $(KUSTOMIZE) edit set image controller=${DEFAULT_OPERATOR_IMAGE} +.PHONY: bundle-ignore-created-at +bundle-ignore-created-at: + git diff --quiet -I'^ createdAt: ' ./bundle && git checkout ./bundle || true + .PHONY: bundle-build bundle-build: ## Build the bundle image. docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .