[main] Add OCP 4.19 and 4.20 (#3735)

* update docs-default `max` OCP version to 4.19

* generated files

* use scos images for CI

* generated files

* add policy.json for "opm render"

* workaround for cert-manager webhook certificate setup delay

* generated files

* increase cert-manager setup delay

* increasing the certmanager setup delay

* add ocpVersions.doc to specify target OCP docs version in quickstarts

* explicit ocpVersion.doc OCP version for docs links

Author: maschmid

hack/generate/csv.sh

@@ -156,7 +156,7 @@ yaml_keys[spec.minKubeVersion]="$(metadata.get requirements.kube.minVersion)"
 yaml_keys[spec.replaces]="$(metadata.get project.name).v$(metadata.get olm.replaces)"
 
 declare -A vars
-vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
+vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.doc')"
 vars[VERSION_MAJOR_MINOR]="$(versions.major_minor $(metadata.get 'project.version'))"
 
 function add_related_image {

hack/generate/override-snapshot.sh

@@ -58,7 +58,7 @@ spec:
 EOF
 
   tmp_catalog_dir=$(mktemp -d)
-  max_ocp_version="$(metadata.get requirements.ocpVersion.max)"
+  max_ocp_version="$(metadata.get requirements.ocpVersion.list[-1])"
   max_ocp_version=${max_ocp_version/./}
   latest_index_image="${registry_quay}-fbc-${max_ocp_version}/serverless-index-${so_short_version}-fbc-${max_ocp_version}:latest"
 

hack/generate/quickstart.sh

@@ -9,7 +9,7 @@ target="${2:?Provide a target quickstart file as arg[2]}"
 source "$(dirname "${BASH_SOURCE[0]}")/../lib/metadata.bash"
 
 declare -A vars
-vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
+vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.doc')"
 
 # Start fresh
 cp "$template" "$target"

hack/lib/certmanager.bash

@@ -25,6 +25,10 @@ function deploy_certmanager_operator {
   timeout 600 "[[ \$(oc get deploy -n ${deployment_namespace} cert-manager-webhook --no-headers | wc -l) != 1 ]]" || return 1
   oc wait deployments -n ${deployment_namespace} cert-manager-webhook --for condition=available --timeout=600s
   oc wait deployments -n ${deployment_namespace} cert-manager --for condition=available --timeout=600s
+
+  # TODO: workaround for the cert-manager being Ready before it setups webhook certs
+  logger.info "Sleeping for 60s to let cert-manager setup its webhook certs"
+  sleep 60
 }
 
 function deploy_certificates {

knative-operator/deploy/resources/quickstart/serverless-application-quickstart.yaml

@@ -48,7 +48,7 @@ spec:
       review:
         failedTaskHelp: >-
           This task isn’t verified yet. Try the task again, or [read
-          more](https://docs.openshift.com/container-platform/4.18/applications/odc-viewing-application-composition-using-topology-view.html)
+          more](https://docs.openshift.com/container-platform/4.19/applications/odc-viewing-application-composition-using-topology-view.html)
           about this topic.
         instructions: >-
           #### To verify the application was successfully created:
@@ -85,7 +85,7 @@ spec:
       review:
         failedTaskHelp: >-
           This task isn’t verified yet. Try the task again, or [read
-          more](https://docs.openshift.com/container-platform/4.18/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
+          more](https://docs.openshift.com/container-platform/4.19/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
           about this topic.
         instructions: >-
           #### To verify the application scaled down:
@@ -126,7 +126,7 @@ spec:
       review:
         failedTaskHelp: >-
           This task isn’t verified yet. Try the task again, or [read
-          more](https://docs.openshift.com/container-platform/4.18/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
+          more](https://docs.openshift.com/container-platform/4.19/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
           about this topic.
         instructions: >-
           #### To verify that the event connected to your Knative service:
@@ -178,7 +178,7 @@ spec:
       review:
         failedTaskHelp: >-
           This task isn’t verified yet. Try the task again, or [read
-          more](https://docs.openshift.com/container-platform/4.18/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
+          more](https://docs.openshift.com/container-platform/4.19/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
           about this topic.
         instructions: >-
           #### To verify that you forced a new revision and set traffic
@@ -206,7 +206,7 @@ spec:
       review:
         failedTaskHelp: >-
           This task is not verified yet. Try the task again, or [read
-          more](https://docs.openshift.com/container-platform/4.18/applications/odc-deleting-applications.html)
+          more](https://docs.openshift.com/container-platform/4.19/applications/odc-deleting-applications.html)
           about this topic.
         instructions: |-
           #### To verify you deleted your application:          :

olm-catalog/serverless-operator-index/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/origin/4.18:operator-registry AS opm
+FROM registry.ci.openshift.org/origin/scos-4.20:operator-registry AS opm
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal as builder
 
@@ -7,6 +7,9 @@ COPY --from=opm /bin/opm /bin/opm
 # Copy declarative config root into image at /configs
 COPY olm-catalog/serverless-operator-index/configs /configs
 
+# Copy policy.json for opm
+COPY olm-catalog/serverless-operator-index/policy.json /etc/containers/policy.json
+
 RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> /configs/index.yaml
 RUN /bin/opm render --skip-tls-verify -o yaml \
 quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle:1.35.0 \
@@ -15,7 +18,7 @@ quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serv
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
-FROM registry.ci.openshift.org/origin/4.18:operator-registry
+FROM registry.ci.openshift.org/origin/scos-4.20:operator-registry
 
 # Copy declarative config root into image at /configs
 COPY --from=builder /configs /configs

olm-catalog/serverless-operator-index/policy.json

@@ -0,0 +1,14 @@
+{
+    "default": [
+        {
+            "type": "insecureAcceptAnything"
+        }
+    ],
+    "transports":
+        {
+            "docker-daemon":
+                {
+                    "": [{"type":"insecureAcceptAnything"}]
+                }
+        }
+}

olm-catalog/serverless-operator-index/v4.14/Dockerfile

@@ -1,4 +1,4 @@
-ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.14:operator-registry
+ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.14:operator-registry
 
 FROM $OPM_IMAGE
 

olm-catalog/serverless-operator-index/v4.15/Dockerfile

@@ -1,4 +1,4 @@
-ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.15:operator-registry
+ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.15:operator-registry
 
 FROM $OPM_IMAGE
 

olm-catalog/serverless-operator-index/v4.16/Dockerfile

@@ -1,4 +1,4 @@
-ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.16:operator-registry
+ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.16:operator-registry
 
 FROM $OPM_IMAGE