Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 6 commits into from
Feb 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b3d83d
Run `make generated-files`
creydr Feb 14, 2025
b61e0f5
Run `make generate-catalog`
creydr Feb 14, 2025
6b82d82
Improve logging in override snapshot gen
creydr Feb 14, 2025
1f2e262
rerun `make generated-files`
creydr Feb 14, 2025
95f52d5
Run testselect directly
creydr Feb 14, 2025
a96d5fe
Unset GOFLAGS env before go run testselect
creydr Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hack/generate/override-snapshot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")"
Expand Down
12 changes: 2 additions & 10 deletions hack/lib/testselect.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:'
Expand Down
2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator-index/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions olm-catalog/serverless-operator-index/image_content_source_policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator-index/v4.14/catalog-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
86 changes: 43 additions & 43 deletions olm-catalog/serverless-operator-index/v4.14/catalog/serverless-operator/catalog.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator-index/v4.15/catalog-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
86 changes: 43 additions & 43 deletions olm-catalog/serverless-operator-index/v4.15/catalog/serverless-operator/catalog.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator-index/v4.16/catalog-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
86 changes: 43 additions & 43 deletions olm-catalog/serverless-operator-index/v4.16/catalog/serverless-operator/catalog.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator-index/v4.17/catalog-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading