Fix containerImage field and remove statement about failing CI (#2386)

* Fix containerImage field and remove statement about failing CI Signed-off-by: Israel Blancas <[email protected]> * Fix CI Signed-off-by: Israel Blancas <[email protected]> * Fix CI Signed-off-by: Israel Blancas <[email protected]> * Fix CI Signed-off-by: Israel Blancas <[email protected]> --------- Signed-off-by: Israel Blancas <[email protected]>
jaegertracing · Dec 11, 2023 · 9f49945 · 9f49945
1 parent 84a503f
commit 9f49945
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -349,6 +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:$(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)

diff --git 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
@@ -18,8 +18,8 @@ metadata:
     capabilities: Deep Insights
     categories: Logging & Tracing
     certified: "false"
-    containerImage: quay.io/jaegertracing/jaeger-operator
-    createdAt: "2023-12-07T12:08:38Z"
+    containerImage: quay.io/jaegertracing/jaeger-operator:1.52.0
+    createdAt: "2023-12-11T08:36:29Z"
     description: Provides tracing, monitoring and troubleshooting for microservices-based
       distributed systems
     operators.openshift.io/infrastructure-features: '["disconnected"]'

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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.
 . Once the changes above are merged and available in `main` tag it with the desired version, prefixed with `v`, eg. `v1.30.0`
@@ Expand Down @@