Run make generated-files and make generate-catalog (#3387)

* Run `make generated-files`

* Run `make generate-catalog`

* Improve logging in override snapshot gen

* rerun `make generated-files`

* Run testselect directly

* Unset GOFLAGS env before go run testselect

Author: creydr

hack/generate/override-snapshot.sh

@@ -10,6 +10,8 @@ function add_component {
   component=${2}
   image_ref=${3}
 
+  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")"

hack/lib/testselect.bash

@@ -2,15 +2,7 @@
 
 function run_testselect {
   if [[ -n "${ARTIFACT_DIR:-}" && -n "${CLONEREFS_OPTIONS:-}" ]]; then
-    local clonedir rootdir hack_tmp_dir
-
-    hack_tmp_dir=$(mktemp -d)
-    git clone --branch main https://github.com/openshift-knative/hack "$hack_tmp_dir"
-    pushd "$hack_tmp_dir" || return $?
-    go install github.com/openshift-knative/hack/cmd/testselect
-    popd || return $?
-    rm -rf "$hack_tmp_dir"
-
+    local clonedir rootdir
     clonedir=$(mktemp -d)
 
     # CLONEREFS_OPTIONS var is set in CI
@@ -22,7 +14,7 @@ function run_testselect {
 
     # The testselect clones a repository. Make sure it's cloned into a temp dir.
     pushd "$clonedir" || return $?
-    "$(go env GOPATH)/bin/testselect" --testsuites="${rootdir}/test/testsuites.yaml" --clonerefs="${ARTIFACT_DIR}/clonerefs.json" --output="${ARTIFACT_DIR}/tests.txt"
+    GOFLAGS="" go run github.com/openshift-knative/hack/cmd/testselect@latest --testsuites="${rootdir}/test/testsuites.yaml" --clonerefs="${ARTIFACT_DIR}/clonerefs.json" --output="${ARTIFACT_DIR}/tests.txt"
     popd || return $?
 
     logger.info 'Tests to be run:'

olm-catalog/serverless-operator-index/Dockerfile

@@ -11,7 +11,7 @@ RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >>
 RUN /bin/opm render --skip-tls-verify -o yaml \
 registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle \
 registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \
-      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:b41c3fd1702ae5df6cd71db1d38ab380723c9242cd807030f05a54702ff38630 >> /configs/index.yaml
+      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:69199bc084a852e42e4677c7c3c679bf1e9cc71d8af167f2fb8b758c5a0b8bec >> /configs/index.yaml
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe

olm-catalog/serverless-operator-index/image_content_source_policy.yaml

@@ -6,20 +6,6 @@ metadata:
   name: serverless-image-content-source-policy
 spec:
   repositoryDigestMirrors:
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/backstage-plugins-eventmesh", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/backstage-plugins-eventmesh"]
-      source: "registry.redhat.io/openshift-serverless-1/backstage-plugins-eventmesh-rhel8"
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-istio-controller", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-istio-controller"]
-      source: "registry.redhat.io/openshift-serverless-1/eventing-istio-controller-rhel8"
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-controller", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-controller"]
-      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-controller-rhel8"
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-dispatcher", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-dispatcher"]
-      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-dispatcher-rhel8"
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-receiver", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-receiver"]
-      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-receiver-rhel8"
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-webhook", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-webhook"]
-      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-webhook-rhel8"
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/knative-client-plugin-event-sender", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/knative-client-plugin-event-sender"]
-      source: "registry.redhat.io/openshift-serverless-1/knative-client-plugin-event-sender-rhel8"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/client-kn", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/client-kn"]
       source: "registry.redhat.io/openshift-serverless-1/client-kn-rhel8"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-apiserver-receive-adapter", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-apiserver-receive-adapter"]
@@ -76,6 +62,8 @@ spec:
       source: "registry.redhat.io/openshift-serverless-1/func-utils-rhel8"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/ingress", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/ingress"]
       source: "registry.redhat.io/openshift-serverless-1/ingress-rhel8-operator"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/knative", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/knative"]
+      source: "registry.redhat.io/openshift-serverless-1/knative-rhel8-operator"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-backstage-plugins-eventmesh", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-backstage-plugins-eventmesh"]
       source: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-cli-artifacts", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-cli-artifacts"]
@@ -136,8 +124,6 @@ spec:
       source: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-serving-webhook", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-serving-webhook"]
       source: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8"
-    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/knative", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/knative"]
-      source: "registry.redhat.io/openshift-serverless-1/knative-rhel8-operator"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kourier-control", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kourier-control"]
       source: "registry.redhat.io/openshift-serverless-1/kourier-control-rhel8"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/net-istio-controller", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/net-istio-controller"]
@@ -178,3 +164,17 @@ spec:
       source: "registry.redhat.io/openshift-serverless-1/serving-webhook-rhel8"
     - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/svls-must-gather", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/svls-must-gather"]
       source: "registry.redhat.io/openshift-serverless-1/svls-must-gather-rhel8"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/backstage-plugins-eventmesh", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/backstage-plugins-eventmesh"]
+      source: "registry.redhat.io/openshift-serverless-1/backstage-plugins-eventmesh-rhel8"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-istio-controller", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-istio-controller"]
+      source: "registry.redhat.io/openshift-serverless-1/eventing-istio-controller-rhel8"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-controller", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-controller"]
+      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-controller-rhel8"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-dispatcher", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-dispatcher"]
+      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-dispatcher-rhel8"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-receiver", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-receiver"]
+      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-receiver-rhel8"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/eventing-kafka-broker-webhook", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/eventing-kafka-broker-webhook"]
+      source: "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-webhook-rhel8"
+    - mirrors: ["quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/knative-client-plugin-event-sender", "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/knative-client-plugin-event-sender"]
+      source: "registry.redhat.io/openshift-serverless-1/knative-client-plugin-event-sender-rhel8"

olm-catalog/serverless-operator-index/v4.14/catalog-template.yaml

@@ -450,7 +450,7 @@ entries:
   - image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:93b945eb2361b07bc86d67a9a7d77a0301a0bad876c83a9a64af2cfb86c83bff
     schema: olm.bundle
   - schema: olm.bundle
-    image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:28d4fd68f9542352debeeca1a090965bd67452e198aa4734874716675d8b6831
+    image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:69199bc084a852e42e4677c7c3c679bf1e9cc71d8af167f2fb8b758c5a0b8bec
   - entries:
       - name: serverless-operator.v1.20.0
         replaces: serverless-operator.v1.19.0

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

@@ -450,7 +450,7 @@ entries:
   - image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:93b945eb2361b07bc86d67a9a7d77a0301a0bad876c83a9a64af2cfb86c83bff
     schema: olm.bundle
   - schema: olm.bundle
-    image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:28d4fd68f9542352debeeca1a090965bd67452e198aa4734874716675d8b6831
+    image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:69199bc084a852e42e4677c7c3c679bf1e9cc71d8af167f2fb8b758c5a0b8bec
   - entries:
       - name: serverless-operator.v1.20.0
         replaces: serverless-operator.v1.19.0

olm-catalog/serverless-operator-index/v4.15/catalog-template.yaml

@@ -450,7 +450,7 @@ entries:
   - image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:93b945eb2361b07bc86d67a9a7d77a0301a0bad876c83a9a64af2cfb86c83bff
     schema: olm.bundle
   - schema: olm.bundle
-    image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:28d4fd68f9542352debeeca1a090965bd67452e198aa4734874716675d8b6831
+    image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:69199bc084a852e42e4677c7c3c679bf1e9cc71d8af167f2fb8b758c5a0b8bec
   - entries:
       - name: serverless-operator.v1.20.0
         replaces: serverless-operator.v1.19.0