From d677d834237e6c8a65b695c7f748035c66a606f2 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Mon, 11 Dec 2023 09:31:51 +0100 Subject: [PATCH 1/4] Fix containerImage field and remove statement about failing CI Signed-off-by: Israel Blancas --- Makefile | 1 + RELEASE.md | 1 - bundle/manifests/jaeger-operator.clusterserviceversion.yaml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fae8179b0..5b8a41f60 100644 --- a/Makefile +++ b/Makefile @@ -354,6 +354,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --manifests --version $(VERSION) $(BUNDLE_METADATA_OPTS) $(OPERATOR_SDK) bundle validate ./bundle ./hack/ignore-createdAt-bundle.sh + $(SED) -i "s#containerImage: quay.io/jaegertracing/jaeger-operator#containerImage: quay.io/jaegertracing/jaeger-operator:$(VERSION)#g" bundle/manifests/jaeger-operator.clusterserviceversion.yaml .PHONY: bundle-build bundle-build: ## Build the bundle image. diff --git a/RELEASE.md b/RELEASE.md index 8b0f8d9df..dd34f20c8 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -27,7 +27,6 @@ Steps to release a new version of the Jaeger Operator: ```sh git commit -sm "Preparing release v1.30.0" ``` - Note that the OpenShift CI test job fails. This is expected and the release PR can be merged. 5. Once the changes above are merged and available in `main` tag it with the desired version, prefixed with `v`, eg. `v1.30.0` diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml index d43e4e62e..46fa1fef9 100644 --- a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml +++ b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing certified: "false" - containerImage: quay.io/jaegertracing/jaeger-operator + containerImage: quay.io/jaegertracing/jaeger-operator:1.52.0 createdAt: "2023-12-07T12:08:38Z" description: Provides tracing, monitoring and troubleshooting for microservices-based distributed systems From 063a76af9ab8c1a3bd6da6e2e323d1fc6bf916b1 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Mon, 11 Dec 2023 09:36:43 +0100 Subject: [PATCH 2/4] Fix CI Signed-off-by: Israel Blancas --- bundle/manifests/jaeger-operator.clusterserviceversion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml index 46fa1fef9..762a0bbbf 100644 --- a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml +++ b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml @@ -19,7 +19,7 @@ metadata: categories: Logging & Tracing certified: "false" containerImage: quay.io/jaegertracing/jaeger-operator:1.52.0 - createdAt: "2023-12-07T12:08:38Z" + createdAt: "2023-12-11T08:36:29Z" description: Provides tracing, monitoring and troubleshooting for microservices-based distributed systems operators.openshift.io/infrastructure-features: '["disconnected"]' From 17e45a0c5c68d32c4c132c48c0cfccc4d5909def Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Mon, 11 Dec 2023 09:40:47 +0100 Subject: [PATCH 3/4] Fix CI Signed-off-by: Israel Blancas --- Makefile | 2 +- .../manifests/bases/jaeger-operator.clusterserviceversion.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5b8a41f60..dbfda5d0b 100644 --- a/Makefile +++ b/Makefile @@ -349,12 +349,12 @@ $(ENVTEST): $(LOCALBIN) .PHONY: bundle bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files. + $(SED) -i "s#containerImage: quay.io/jaegertracing/jaeger-operator#containerImage: quay.io/jaegertracing/jaeger-operator:$(VERSION)#g" config/manifests/bases/jaeger-operator.clusterserviceversion.yaml $(OPERATOR_SDK) generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --manifests --version $(VERSION) $(BUNDLE_METADATA_OPTS) $(OPERATOR_SDK) bundle validate ./bundle ./hack/ignore-createdAt-bundle.sh - $(SED) -i "s#containerImage: quay.io/jaegertracing/jaeger-operator#containerImage: quay.io/jaegertracing/jaeger-operator:$(VERSION)#g" bundle/manifests/jaeger-operator.clusterserviceversion.yaml .PHONY: bundle-build bundle-build: ## Build the bundle image. diff --git a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml index b08766db6..67bbdd105 100644 --- a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml @@ -15,7 +15,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing certified: "false" - containerImage: quay.io/jaegertracing/jaeger-operator + containerImage: quay.io/jaegertracing/jaeger-operator:1.52.0 createdAt: "2023-05-16T04:47:12Z" description: Provides tracing, monitoring and troubleshooting for microservices-based distributed systems From d63c91555a78f27841cc0a6bae1c43601f2f591e Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Mon, 11 Dec 2023 09:48:55 +0100 Subject: [PATCH 4/4] Fix CI Signed-off-by: Israel Blancas --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dbfda5d0b..872f5eafa 100644 --- a/Makefile +++ b/Makefile @@ -349,7 +349,7 @@ $(ENVTEST): $(LOCALBIN) .PHONY: bundle bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files. - $(SED) -i "s#containerImage: quay.io/jaegertracing/jaeger-operator#containerImage: quay.io/jaegertracing/jaeger-operator:$(VERSION)#g" config/manifests/bases/jaeger-operator.clusterserviceversion.yaml + $(SED) -i "s#containerImage: quay.io/jaegertracing/jaeger-operator:$(OPERATOR_VERSION)#containerImage: quay.io/jaegertracing/jaeger-operator:$(VERSION)#g" config/manifests/bases/jaeger-operator.clusterserviceversion.yaml $(OPERATOR_SDK) generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --manifests --version $(VERSION) $(BUNDLE_METADATA_OPTS)