Skip to content

Commit

Permalink
[release-1.32] Bump to 1.32.2 (#2786)
Browse files Browse the repository at this point in the history
* Bump project metadata to 1.32.2

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Make generated-files

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Replaces x.y.0 version

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
  • Loading branch information
pierDipi authored Jul 24, 2024
1 parent b362a40 commit e44e8d1
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL operators.operatorframework.io.bundle.channels.v1="stable,stable-1.32"
LABEL \
com.redhat.component="openshift-serverless-1-serverless-operator-bundle-container" \
name="openshift-serverless-1/serverless-operator-bundle" \
version="1.32.1" \
version="1.32.2" \
summary="Red Hat OpenShift Serverless Bundle" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless Bundle" \
Expand Down
2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator/index/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN /bin/opm render --skip-tls-verify -o yaml \
registry.ci.openshift.org/knative/openshift-serverless-v1.30.0:serverless-bundle \
registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \
registry.ci.openshift.org/knative/release-1.32.0:serverless-bundle \
registry.ci.openshift.org/knative/release-1.32.1:serverless-bundle >> /configs/index.yaml || \
registry.ci.openshift.org/knative/release-1.32.2:serverless-bundle >> /configs/index.yaml || \
/bin/opm render --skip-tls-verify -o yaml \
registry.ci.openshift.org/knative/openshift-serverless-v1.30.0:serverless-bundle \
registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \
Expand Down
8 changes: 4 additions & 4 deletions olm-catalog/serverless-operator/index/configs/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ entries:
- name: "serverless-operator.v1.32.0"
replaces: "serverless-operator.v1.31.0"
skipRange: ">=1.31.0 <1.32.0"
- name: "serverless-operator.v1.32.1"
- name: "serverless-operator.v1.32.2"
replaces: "serverless-operator.v1.32.0"
skipRange: ">=1.32.0 <1.32.1"
skipRange: ">=1.32.0 <1.32.2"
---
schema: olm.channel
name: stable-1.32
Expand All @@ -19,9 +19,9 @@ entries:
- name: "serverless-operator.v1.32.0"
replaces: "serverless-operator.v1.31.0"
skipRange: ">=1.31.0 <1.32.0"
- name: "serverless-operator.v1.32.1"
- name: "serverless-operator.v1.32.2"
replaces: "serverless-operator.v1.32.0"
skipRange: ">=1.32.0 <1.32.1"
skipRange: ">=1.32.0 <1.32.2"
---
schema: olm.channel
name: stable-1.31
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ metadata:
Deploy and manage event-driven serverless applications and functions using Knative.
repository: https://github.com/openshift-knative/serverless-operator
support: Red Hat
olm.skipRange: '>=1.32.0 <1.32.1'
olm.skipRange: '>=1.32.0 <1.32.2'
operators.openshift.io/must-gather-image: quay.io/openshift-knative/must-gather
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: serverless-operator.v1.32.1
name: serverless-operator.v1.32.2
namespace: placeholder
spec:
# User-facing metadata
Expand Down Expand Up @@ -827,7 +827,7 @@ spec:
serviceAccountName: knative-operator
containers:
- name: knative-operator
image: registry.ci.openshift.org/knative/release-1.32.1:serverless-openshift-knative-operator
image: registry.ci.openshift.org/knative/release-1.32.2:serverless-openshift-knative-operator
readinessProbe:
periodSeconds: 1
httpGet:
Expand Down Expand Up @@ -944,7 +944,7 @@ spec:
- name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39"
value: "registry.access.redhat.com/ubi8/python-39@sha256:cf0af1732c483d4e6ba708f9f4d5541cb43c98c3c67c604c23b0e55897eebe41"
- name: "CURRENT_VERSION"
value: "1.32.1"
value: "1.32.2"
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
Expand Down Expand Up @@ -982,7 +982,7 @@ spec:
- ALL
containers:
- name: knative-openshift
image: registry.ci.openshift.org/knative/release-1.32.1:serverless-knative-operator
image: registry.ci.openshift.org/knative/release-1.32.2:serverless-knative-operator
imagePullPolicy: Always
readinessProbe:
httpGet:
Expand Down Expand Up @@ -1126,7 +1126,7 @@ spec:
- name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate"
value: "registry.ci.openshift.org/openshift/knative-eventing-migrate:knative-v1.11"
- name: "CURRENT_VERSION"
value: "1.32.1"
value: "1.32.2"
- name: "KNATIVE_EVENTING_KAFKA_BROKER_VERSION"
value: "1.11"
securityContext:
Expand Down Expand Up @@ -1154,7 +1154,7 @@ spec:
serviceAccountName: knative-openshift-ingress
containers:
- name: knative-openshift-ingress
image: registry.ci.openshift.org/knative/release-1.32.1:serverless-ingress
image: registry.ci.openshift.org/knative/release-1.32.2:serverless-ingress
imagePullPolicy: Always
ports:
- containerPort: 9090
Expand Down Expand Up @@ -1303,11 +1303,11 @@ spec:
- knativeeventings.operator.knative.dev
relatedImages:
- name: "knative-operator"
image: "registry.ci.openshift.org/knative/release-1.32.1:serverless-openshift-knative-operator"
image: "registry.ci.openshift.org/knative/release-1.32.2:serverless-openshift-knative-operator"
- name: "knative-openshift"
image: "registry.ci.openshift.org/knative/release-1.32.1:serverless-knative-operator"
image: "registry.ci.openshift.org/knative/release-1.32.2:serverless-knative-operator"
- name: "knative-openshift-ingress"
image: "registry.ci.openshift.org/knative/release-1.32.1:serverless-ingress"
image: "registry.ci.openshift.org/knative/release-1.32.2:serverless-ingress"
- name: "IMAGE_queue-proxy"
image: "registry.ci.openshift.org/openshift/knative-serving-queue:knative-v1.11"
- name: "IMAGE_activator"
Expand Down Expand Up @@ -1395,4 +1395,4 @@ spec:
- name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate"
image: "registry.ci.openshift.org/openshift/knative-eventing-migrate:knative-v1.11"
replaces: serverless-operator.v1.32.0
version: 1.32.1
version: 1.32.2
4 changes: 2 additions & 2 deletions olm-catalog/serverless-operator/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ project:
# all components in `dependencies.previous` to the same versions as `dependencies` in the same PR.
# Otherwise, the upgrade tests will not pass, as we have a different SO version with the same bundle contents.
# Also make sure to update values under `olm.previous` by copying from `olm.replaces` and `olm.skipRange`.
version: 1.32.1
version: 1.32.2
olm:
replaces: 1.32.0
skipRange: '>=1.32.0 <1.32.1'
skipRange: '>=1.32.0 <1.32.2'
channels:
default: stable
list:
Expand Down

0 comments on commit e44e8d1

Please sign in to comment.