diff --git a/Makefile b/Makefile index dedad42a2..c8d7a997e 100644 --- a/Makefile +++ b/Makefile @@ -270,7 +270,7 @@ redhat-certificated-bundle: yq kustomize manifests 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) $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) $(YQ) eval -i ".metadata.annotations.\"olm.skipRange\" = \"<$(VERSION)\"" bundle/manifests/function-mesh.clusterserviceversion.yaml - $(YQ) eval -i ".metadata.annotations.\"olm.properties\" = ([{\"type\": \"olm.maxOpenShiftVersion\", \"value\": \"4.11\"}] | @json)" bundle/manifests/function-mesh.clusterserviceversion.yaml + $(YQ) eval -i ".metadata.annotations.\"olm.properties\" = ([{\"type\": \"olm.maxOpenShiftVersion\", \"value\": \"4.13\"}] | @json)" bundle/manifests/function-mesh.clusterserviceversion.yaml $(YQ) eval -i ".metadata.annotations.createdAt = \"$(BUILD_DATETIME)\"" bundle/manifests/function-mesh.clusterserviceversion.yaml $(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 $(YQ) eval -i '.annotations += {"operators.operatorframework.io.bundle.channel.default.v1":"alpha"}' bundle/metadata/annotations.yaml diff --git a/config/manifests/bases/function-mesh.clusterserviceversion.yaml b/config/manifests/bases/function-mesh.clusterserviceversion.yaml index f619ecd7b..21bfb34d1 100644 --- a/config/manifests/bases/function-mesh.clusterserviceversion.yaml +++ b/config/manifests/bases/function-mesh.clusterserviceversion.yaml @@ -8,7 +8,7 @@ metadata: containerImage: streamnative/function-mesh-operator:v0.0.0 description: The Function Mesh Operator manages the Pulsar Functions and Connectors deployed on a Kubernetes cluster. - operatorhub.io/ui-metadata-max-k8s-version: "1.24" + operatorhub.io/ui-metadata-max-k8s-version: "1.26" repository: https://github.com/streamnative/function-mesh support: StreamNative name: function-mesh.v0.0.0 @@ -72,7 +72,7 @@ spec: - email: function-mesh@streamnative.io name: Function Mesh maturity: alpha - minKubeVersion: v1.17.0 + minKubeVersion: v1.23.0 provider: name: StreamNative url: https://streamnative.io diff --git a/hack/postprocess-bundle.sh b/hack/postprocess-bundle.sh index 9b6e851c6..54ca816f1 100755 --- a/hack/postprocess-bundle.sh +++ b/hack/postprocess-bundle.sh @@ -21,14 +21,14 @@ # These labels are required to be in the bundle.Dockerfile, but can't be added by the operator-sdk automatically cat <> bundle.Dockerfile # Certified Openshift required labels -LABEL com.redhat.openshift.versions="v4.8-v4.11" +LABEL com.redhat.openshift.versions="v4.10-v4.13" LABEL com.redhat.delivery.operator.bundle=true LABEL com.redhat.delivery.backport=true LABEL operators.operatorframework.io.bundle.channel.default.v1="alpha" EOF # Add them to the bundle metadata also -yq eval -i '.annotations."com.redhat.openshift.versions" = "v4.8-v4.11"' bundle/metadata/annotations.yaml +yq eval -i '.annotations."com.redhat.openshift.versions" = "v4.10-v4.13"' bundle/metadata/annotations.yaml yq eval -i '.annotations."com.redhat.delivery.operator.bundle" = true' bundle/metadata/annotations.yaml yq eval -i '.annotations."com.redhat.delivery.backport" = true' bundle/metadata/annotations.yaml yq eval -i '.annotations."operators.operatorframework.io.bundle.channel.default.v1" = "alpha"' bundle/metadata/annotations.yaml