[main] Bump Serverless Operator version after release-1.33 cut (#2636)

* Bump SO version * Skip DeploymentFailurePostUpgrade when no upgrade happens --------- Co-authored-by: creydr <8654480+creydr@users.noreply.github.com> Co-authored-by: Reto Lehmann <retocode@icloud.com>
openshift-knative · May 13, 2024 · 09ea7e4 · 09ea7e4
1 parent 3e6b2db
commit 09ea7e4
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 38 deletions.
diff --git a/olm-catalog/serverless-operator/Dockerfile b/olm-catalog/serverless-operator/Dockerfile
@@ -8,12 +8,12 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=serverless-operator
 LABEL operators.operatorframework.io.bundle.channel.default.v1="stable"
-LABEL operators.operatorframework.io.bundle.channels.v1="stable,stable-1.33"
+LABEL operators.operatorframework.io.bundle.channels.v1="stable,stable-1.34"
 
 LABEL \
       com.redhat.component="openshift-serverless-1-serverless-operator-bundle-container" \
       name="openshift-serverless-1/serverless-operator-bundle" \
-      version="1.33.0" \
+      version="1.34.0" \
       summary="Red Hat OpenShift Serverless Bundle" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless Bundle" \

diff --git a/olm-catalog/serverless-operator/index/Dockerfile b/olm-catalog/serverless-operator/index/Dockerfile
@@ -8,11 +8,11 @@ COPY --from=opm /bin/opm /bin/opm
 COPY olm-catalog/serverless-operator/index/configs /configs
 
 RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> /configs/index.yaml
-RUN /bin/opm render --skip-tls-verify -o yaml 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.33.0:serverless-bundle >> /configs/index.yaml || \
-    /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \
-      registry.ci.openshift.org/knative/release-1.32.0:serverless-bundle \
+RUN /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.32.0:serverless-bundle \
+      registry.ci.openshift.org/knative/release-1.33.0:serverless-bundle \
+      registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle >> /configs/index.yaml || \
+    /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.32.0:serverless-bundle \
+      registry.ci.openshift.org/knative/release-1.33.0:serverless-bundle \
       registry.ci.openshift.org/knative/serverless-bundle:main >> /configs/index.yaml
 
 # The base image is expected to contain

diff --git a/olm-catalog/serverless-operator/index/configs/index.yaml b/olm-catalog/serverless-operator/index/configs/index.yaml
@@ -3,37 +3,37 @@ schema: olm.channel
 name: stable
 package: serverless-operator
 entries:
-  - name: "serverless-operator.v1.31.0"
   - name: "serverless-operator.v1.32.0"
-    replaces: "serverless-operator.v1.31.0"
-    skipRange: ">=1.31.0 <1.32.0"
   - name: "serverless-operator.v1.33.0"
     replaces: "serverless-operator.v1.32.0"
     skipRange: ">=1.32.0 <1.33.0"
+  - name: "serverless-operator.v1.34.0"
+    replaces: "serverless-operator.v1.33.0"
+    skipRange: ">=1.33.0 <1.34.0"
 ---
 schema: olm.channel
-name: stable-1.33
+name: stable-1.34
 package: serverless-operator
 entries:
-  - name: "serverless-operator.v1.31.0"
   - name: "serverless-operator.v1.32.0"
-    replaces: "serverless-operator.v1.31.0"
-    skipRange: ">=1.31.0 <1.32.0"
   - name: "serverless-operator.v1.33.0"
     replaces: "serverless-operator.v1.32.0"
     skipRange: ">=1.32.0 <1.33.0"
+  - name: "serverless-operator.v1.34.0"
+    replaces: "serverless-operator.v1.33.0"
+    skipRange: ">=1.33.0 <1.34.0"
 ---
 schema: olm.channel
-name: stable-1.32
+name: stable-1.33
 package: serverless-operator
 entries:
-  - name: "serverless-operator.v1.31.0"
   - name: "serverless-operator.v1.32.0"
-    replaces: "serverless-operator.v1.31.0"
-    skipRange: ">=1.31.0 <1.32.0"
+  - name: "serverless-operator.v1.33.0"
+    replaces: "serverless-operator.v1.32.0"
+    skipRange: ">=1.32.0 <1.33.0"
 ---
 schema: olm.channel
-name: stable-1.31
+name: stable-1.32
 package: serverless-operator
 entries:
-  - name: "serverless-operator.v1.31.0"
+  - name: "serverless-operator.v1.32.0"
diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
@@ -61,13 +61,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.33.0'
+    olm.skipRange: '>=1.33.0 <1.34.0'
     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.33.0
+  name: serverless-operator.v1.34.0
   namespace: placeholder
 spec:
   # User-facing metadata
@@ -939,7 +939,7 @@ spec:
                       - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39"
                         value: "registry.access.redhat.com/ubi8/python-39@sha256:cf0af1732c483d4e6ba708f9f4d5541cb43c98c3c67c604c23b0e55897eebe41"
                       - name: "CURRENT_VERSION"
-                        value: "1.33.0"
+                        value: "1.34.0"
                     securityContext:
                       allowPrivilegeEscalation: false
                       readOnlyRootFilesystem: true
@@ -1123,7 +1123,7 @@ spec:
                       - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate"
                         value: "registry.ci.openshift.org/openshift/knative-eventing-migrate:knative-v1.12"
                       - name: "CURRENT_VERSION"
-                        value: "1.33.0"
+                        value: "1.34.0"
                       - name: "KNATIVE_EVENTING_KAFKA_BROKER_VERSION"
                         value: "1.12"
                     securityContext:
@@ -1395,5 +1395,5 @@ spec:
       image: "registry.ci.openshift.org/openshift/knative-eventing-migrate:knative-v1.12"
     - name: "IMAGE_MUST_GATHER"
       image: "quay.io/openshift-knative/must-gather"
-  replaces: serverless-operator.v1.32.0
-  version: 1.33.0
+  replaces: serverless-operator.v1.33.0
+  version: 1.34.0
diff --git a/olm-catalog/serverless-operator/metadata/annotations.yaml b/olm-catalog/serverless-operator/metadata/annotations.yaml
@@ -1,6 +1,6 @@
 annotations:
   operators.operatorframework.io.bundle.channel.default.v1: stable
-  operators.operatorframework.io.bundle.channels.v1: stable,stable-1.33
+  operators.operatorframework.io.bundle.channels.v1: stable,stable-1.34
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.metadata.v1: metadata/

diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml
@@ -4,20 +4,20 @@ 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.33.0
+    version: 1.34.0
 olm:
-    replaces: 1.32.0
-    skipRange: '>=1.32.0 <1.33.0'
+    replaces: 1.33.0
+    skipRange: '>=1.33.0 <1.34.0'
     channels:
         default: stable
         list:
             - stable
+            - stable-1.34
             - stable-1.33
             - stable-1.32
-            - stable-1.31
     previous:
-        replaces: 1.31.0
-        skipRange: '>=1.31.0 <1.32.0'
+        replaces: 1.32.0
+        skipRange: '>=1.32.0 <1.33.0'
 requirements:
     kube:
         # The min version validation in `vendor/knative.dev/pkg/version/version.go`
@@ -39,7 +39,7 @@ dependencies:
     net_kourier_artifacts_branch: release-v1.12
     net_istio: knative-v1.12
     net_istio_artifacts_branch: release-v1.12
-    redhat-knative-istio-authz-chart: 1.33.0
+    redhat-knative-istio-authz-chart: 1.34.0
     maistra: 2.4-latest
     eventing: knative-v1.12
     # eventing core midstream branch name
@@ -68,14 +68,14 @@ dependencies:
     operator: 1.13.3
     # Previous versions required for downgrade testing
     previous:
-        serving: knative-v1.11
-        eventing: knative-v1.11
-        eventing_kafka_broker: knative-v1.11
+        serving: knative-v1.12
+        eventing: knative-v1.12
+        eventing_kafka_broker: knative-v1.12
     mustgather:
         image: quay.io/openshift-knative/must-gather
 upgrade_sequence:
-    - csv: serverless-operator.v1.31.0
     - csv: serverless-operator.v1.32.0
     - csv: serverless-operator.v1.32.1
     - csv: serverless-operator.v1.33.0
       source: serverless-operator
+    - csv: serverless-operator.v1.34.0
diff --git a/test/upgrade/upgrade_test.go b/test/upgrade/upgrade_test.go
@@ -177,6 +177,19 @@ func postUpgradeTests(ctx *test.Context, failOnNoJobs bool) []pkgupgrade.Operati
 	tests = append(tests, EventingPostUpgradeTests()...)
 	tests = append(tests, EventingKafkaBrokerPostUpgradeTests()...)
 	tests = append(tests, servingupgrade.ServingPostUpgradeTests()...)
+
+	// Skipping DeploymentFailurePostUpgrade if no upgrade is performed,
+	// as the test expects an update to happen
+	if test.Flags.ServingVersion == test.Flags.ServingVersionPrevious {
+		for i, operation := range tests {
+			if operation.Name() == "DeploymentFailurePostUpgrade" {
+				// make sure we keep the order of the slice:
+				tests = append(tests[:i], tests[i+1:]...)
+				break
+			}
+		}
+	}
+
 	return tests
 }