add ocp 4.20 (#3779)

Author: Kaustubh-pande

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/dockerfile.sh

@@ -22,7 +22,7 @@ values[EVENTING_ISTIO_VERSION]="$(metadata.get dependencies.eventing_istio)"
 values[GOLANG_VERSION]="$(metadata.get requirements.golang)"
 values[NODEJS_VERSION]="$(metadata.get requirements.nodejs)"
 values[OCP_TARGET_VLIST]="$(metadata.get 'requirements.ocpVersion.label')"
-values[OCP_MAX_VERSION]="$(metadata.get 'requirements.ocpVersion.max')"
+values[OCP_MAX_VERSION]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
 values[PREVIOUS_VERSION]="$(metadata.get olm.replaces)"
 values[BUNDLE]="${SERVERLESS_BUNDLE}"
 

hack/generate/override-snapshot.sh

@@ -13,9 +13,9 @@ function add_component {
   echo "Adding ${component} (${image_ref})"
 
   parameters="$(cosign download attestation "${image_ref}" | jq -r '.payload' | base64 -d | jq -c '.predicate.invocation.parameters')"
-  git_repo="$(echo "${parameters}" | jq -r '."git-url"')"
-  revision="$(echo "${parameters}" | jq -r ".revision")"
-  dockerfile="$(echo "${parameters}" | jq -r ".dockerfile")"
+  git_repo="$(echo "${parameters}" | jq -r '."git-url"' | tr ' ' '\n' | sort -u | head -n1)"
+  revision="$(echo "${parameters}" | jq -r '.revision' | tr ' ' '\n' | sort -u | head -n1)"
+  dockerfile="$(echo "${parameters}" | jq -r '.dockerfile' | tr ' ' '\n' | sort -u | head -n1)"
 
   cat << EOF | yq write --inplace --script - "$1"
 - command: update

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.max')" 
+vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.doc')" 
 
 # Start fresh
 cp "$template" "$target"

olm-catalog/serverless-operator-index/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/origin/scos-4.19: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,15 +7,18 @@ 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 \
 registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \
 registry.ci.openshift.org/knative/release-1.36.0:serverless-bundle \
-      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:9d54d00dc46d194f6b30648fbfcdab0f3f5f907dd7bbb6b2a884347aca537d1b >> /configs/index.yaml
+      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:4f7f8adafc5358603847ae8f4e556dfb6c6b348515e81264a676e747a2e1923b >> /configs/index.yaml
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
-FROM registry.ci.openshift.org/origin/scos-4.19: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.20/Dockerfile

@@ -0,0 +1,12 @@
+ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.20:operator-registry
+
+FROM $OPM_IMAGE
+
+LABEL operators.operatorframework.io.index.configs.v1=/configs
+
+COPY catalog/ /configs
+
+RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
+
+ENTRYPOINT ["/bin/opm"]
+CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]

olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml

@@ -29,9 +29,12 @@ requirements:
       - "4.17"
       - "4.18"
       - "4.19"
+      - "4.20"
     min: '4.14'
+    # Version to use for OCP docs links (in CSV or Quickstarts)
+    doc: '4.19'
     # max ocp version publicly available
-    max: '4.19'
+    max: '4.20'
     label: 'v4.14'
     # OCP stream for kube-rbac-proxy image.
     kube-rbac-proxy: "4.17"
@@ -45,7 +48,7 @@ dependencies:
   net_istio: knative-v1.16
   net_istio_artifacts_branch: release-v1.16
   redhat-knative-istio-authz-chart: 1.36.0
-  service_mesh_proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:b9aca441a381227afe58c4b731275996164405b07150db3c9051a82904f31c0b
+  service_mesh_proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:1c19cf86fd05940ef3d0d6e79e6f371db993153f70baedb9107bbe73f236dc24
   eventing: knative-v1.16
   # eventing core midstream branch name
   eventing_artifacts_branch: release-v1.16
@@ -64,7 +67,7 @@ dependencies:
   # backstage-plugins midstream branch or commit
   backstage_plugins_artifacts_branch: release-v1.16
   cli: knative-v1.16
-  kube_rbac_proxy: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:b08c2aadf9bdef7afb07944524f60088cd5c34fa3b2490df5a819fce84748f10
+  kube_rbac_proxy: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:67651adfd8e6c8d12d2b9585c723d5fbdb664818f803312bfe3522e04a81e9b0
   func:
     promotion_tag: knative-v1.16
     tekton_buildah: registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74

olm-catalog/serverless-operator/project.yaml

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/origin/scos-4.19:cli-artifacts AS oc-image
+FROM registry.ci.openshift.org/origin/scos-4.20:cli-artifacts AS oc-image
 
 FROM src