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: Ensure bundle can be installed from alpha channel on openshift 4.15 #351

Merged
merged 3 commits into from
Jan 25, 2024
Merged

fix: Ensure bundle can be installed from alpha channel on openshift 4.15 #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dd2f05
fix(bundle): ensure bundle can be installed on OS 4.15
sthaha Jan 25, 2024
5e25c4b
fix: publish only to alpha channel
sthaha Jan 25, 2024
db852c0
chore: make bundle
sthaha Jan 25, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ escapes_detect: mod-tidy
@go build -tags $(GO_BUILD_TAGS) -gcflags="-m -l" ./... 2>&1 | grep "escapes to heap" || true


CHANNELS ?=alpha,dev-preview
CHANNELS ?=alpha

##@ OLM bundle
#
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=kepler-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha,dev-preview
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
Expand Down
4 changes: 2 additions & 2 deletions bundle/metadata/annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ annotations:
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: kepler-operator
operators.operatorframework.io.bundle.channels.v1: alpha,dev-preview
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.bundle.channel.default.v1: alpha
operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
Expand All @@ -14,4 +14,4 @@ annotations:
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
operators.operatorframework.io.test.config.v1: tests/scorecard/
# Annotations for OpenShift version
com.redhat.openshift.versions: "v4.11-v4.14"
com.redhat.openshift.versions: "v4.12-v4.17"
2 changes: 1 addition & 1 deletion hack/bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ main() {
info "Adding additional metadata annotations"
cat <<-EOF >>bundle/metadata/annotations.yaml
# Annotations for OpenShift version
com.redhat.openshift.versions: "v4.11-v4.14"
com.redhat.openshift.versions: "v4.12-v4.17"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't we decide on 4.14-4.17?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for the downstream .. yes. does not apply to the upstream one.

EOF

run operator-sdk bundle validate ./bundle \
Expand Down
Loading