Skip to content

Commit bb35ec7

Browse files
freeznetjiangpengcheng
authored andcommitted
fix olm bundle labels (#705)
1 parent 2fd6a01 commit bb35ec7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ redhat-certificated-bundle: yq kustomize manifests
270270
cd config/manager && $(KUSTOMIZE) edit set image controller=$(shell docker inspect --format='{{json .RepoDigests}}' $(OPERATOR_IMG) | jq --arg IMAGE_TAG_BASE "$(IMAGE_TAG_BASE)" -c '.[] | select(index($$IMAGE_TAG_BASE))' -r)
271271
$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
272272
$(YQ) eval -i ".metadata.annotations.\"olm.skipRange\" = \"<$(VERSION)\"" bundle/manifests/function-mesh.clusterserviceversion.yaml
273-
$(YQ) eval -i ".metadata.annotations.\"olm.properties\" = ([{\"type\": \"olm.maxOpenShiftVersion\", \"value\": \"4.11\"}] | @json)" bundle/manifests/function-mesh.clusterserviceversion.yaml
273+
$(YQ) eval -i ".metadata.annotations.\"olm.properties\" = ([{\"type\": \"olm.maxOpenShiftVersion\", \"value\": \"4.13\"}] | @json)" bundle/manifests/function-mesh.clusterserviceversion.yaml
274274
$(YQ) eval -i ".metadata.annotations.createdAt = \"$(BUILD_DATETIME)\"" bundle/manifests/function-mesh.clusterserviceversion.yaml
275275
$(YQ) eval -i ".metadata.annotations.containerImage = \"$(shell docker inspect --format='{{json .RepoDigests}}' $(OPERATOR_IMG) | jq --arg IMAGE_TAG_BASE "$(IMAGE_TAG_BASE)" -c '.[] | select(index($$IMAGE_TAG_BASE))' -r)\"" bundle/manifests/function-mesh.clusterserviceversion.yaml
276276
$(YQ) eval -i '.annotations += {"operators.operatorframework.io.bundle.channel.default.v1":"alpha"}' bundle/metadata/annotations.yaml

config/manifests/bases/function-mesh.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
containerImage: streamnative/function-mesh-operator:v0.0.0
99
description: The Function Mesh Operator manages the Pulsar Functions and Connectors
1010
deployed on a Kubernetes cluster.
11-
operatorhub.io/ui-metadata-max-k8s-version: "1.24"
11+
operatorhub.io/ui-metadata-max-k8s-version: "1.26"
1212
repository: https://github.com/streamnative/function-mesh
1313
support: StreamNative
1414
name: function-mesh.v0.0.0
@@ -72,7 +72,7 @@ spec:
7272
7373
name: Function Mesh
7474
maturity: alpha
75-
minKubeVersion: v1.17.0
75+
minKubeVersion: v1.23.0
7676
provider:
7777
name: StreamNative
7878
url: https://streamnative.io

hack/postprocess-bundle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
# These labels are required to be in the bundle.Dockerfile, but can't be added by the operator-sdk automatically
2222
cat <<EOF >> bundle.Dockerfile
2323
# Certified Openshift required labels
24-
LABEL com.redhat.openshift.versions="v4.8-v4.11"
24+
LABEL com.redhat.openshift.versions="v4.10-v4.13"
2525
LABEL com.redhat.delivery.operator.bundle=true
2626
LABEL com.redhat.delivery.backport=true
2727
LABEL operators.operatorframework.io.bundle.channel.default.v1="alpha"
2828
EOF
2929

3030
# Add them to the bundle metadata also
31-
yq eval -i '.annotations."com.redhat.openshift.versions" = "v4.8-v4.11"' bundle/metadata/annotations.yaml
31+
yq eval -i '.annotations."com.redhat.openshift.versions" = "v4.10-v4.13"' bundle/metadata/annotations.yaml
3232
yq eval -i '.annotations."com.redhat.delivery.operator.bundle" = true' bundle/metadata/annotations.yaml
3333
yq eval -i '.annotations."com.redhat.delivery.backport" = true' bundle/metadata/annotations.yaml
3434
yq eval -i '.annotations."operators.operatorframework.io.bundle.channel.default.v1" = "alpha"' bundle/metadata/annotations.yaml

0 commit comments

Comments
 (0)