Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix containerImage field and remove statement about failing CI #2386

Merged
merged 4 commits into from
Dec 11, 2023
Merged

Fix containerImage field and remove statement about failing CI #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d677d83
Fix containerImage field and remove statement about failing CI
iblancasa Dec 11, 2023
063a76a
Fix CI
iblancasa Dec 11, 2023
17e45a0
Fix CI
iblancasa Dec 11, 2023
d63c915
Fix CI
iblancasa Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion RELEASE.md
View file
Open in desktop
Original file line number Diff 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.

5. 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
4 changes: 2 additions & 2 deletions bundle/manifests/jaeger-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
Expand Down
2 changes: 1 addition & 1 deletion config/manifests/bases/jaeger-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading