Skip to content

[main] Run make generated-files #3889

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

Closed
wants to merge 1 commit into from
Closed

[main] Run make generated-files #3889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions knative-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,17 @@ COPY knative-operator/deploy /deploy
USER 65532

LABEL \
com.redhat.component="openshift-serverless-1-knative-operator-rhel9-container" \
name="openshift-serverless-1/knative-operator-rhel9" \
com.redhat.component="openshift-serverless-1-serverless-kn-operator-rhel9-container" \
name="openshift-serverless-1/serverless-kn-operator-rhel9" \
version=$VERSION \
summary="Red Hat OpenShift Serverless 1 Knative Operator" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless 1 Knative Operator" \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Knative Operator" \
io.k8s.description="Red Hat OpenShift Serverless Knative Operator" \
io.openshift.tags="knative-operator" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"

ENTRYPOINT ["/usr/bin/knative-operator"]
4 changes: 3 additions & 1 deletion must-gather/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ USER 65532

LABEL \
com.redhat.component="openshift-serverless-1-must-gather--rhel9-container" \
name="openshift-serverless-1/serverless-must-gather--rhel9" \
name="openshift-serverless-1/serverless-must-gather--rhel9-rhel9" \
version=1.37.0 \
summary="Red Hat OpenShift Serverless 1 Must Gather" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless 1 Must Gather" \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Must Gather" \
io.k8s.description="Red Hat OpenShift Serverless Must Gather" \
io.openshift.tags="must-gather" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"

ENTRYPOINT /usr/bin/gather
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 @@ -16,7 +16,7 @@ COPY olm-catalog/serverless-operator-index/index-bundles.yaml /index-bundles.yam
RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> /configs/index.yaml
RUN cat /index-bundles.yaml >> /configs/index.yaml
RUN /bin/opm render --skip-tls-verify -o yaml \
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-bundle@sha256:04b153467bfed37d4344e42128ad4468a6e4fb3d0cef4cf8da9440743f419ada >> /configs/index.yaml
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-bundle@sha256:60037d273a70fa194fef8db35fe5b0cce933d71dfd75e1944e14ca25c5c8544f >> /configs/index.yaml

# The base image is expected to contain
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
Expand Down
284 changes: 142 additions & 142 deletions olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions openshift-knative-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@ COPY openshift-knative-operator/cmd/openshift-knative-operator/kodata $KO_DATA_P
USER 65532

LABEL \
com.redhat.component="openshift-serverless-1-openshift-knative-operator-rhel9-container" \
name="openshift-serverless-1/openshift-knative-operator-rhel9" \
com.redhat.component="openshift-serverless-1-serverless-openshift-kn-rhel9-operator-container" \
name="openshift-serverless-1/serverless-openshift-kn-rhel9-operator" \
version=$VERSION \
summary="Red Hat OpenShift Serverless 1 Openshift Knative Operator" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless 1 Openshift Knative Operator" \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Openshift Knative Operator" \
io.k8s.description="Red Hat OpenShift Serverless Openshift Knative Operator" \
io.openshift.tags="openshift-knative-operator" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"

ENTRYPOINT ["/usr/bin/openshift-knative-operator"]
6 changes: 4 additions & 2 deletions serving/ingress/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@ COPY LICENSE /licenses/
USER 65532

LABEL \
com.redhat.component="openshift-serverless-1-ingress-rhel9-container" \
name="openshift-serverless-1/ingress-rhel9" \
com.redhat.component="openshift-serverless-1-serverless-ingress-rhel9-container" \
name="openshift-serverless-1/serverless-ingress-rhel9" \
version=$VERSION \
summary="Red Hat OpenShift Serverless 1 Ingress" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless 1 Ingress" \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Ingress" \
io.k8s.description="Red Hat OpenShift Serverless Ingress" \
io.openshift.tags="ingress" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"

ENTRYPOINT ["/usr/bin/ingress"]
2 changes: 2 additions & 0 deletions serving/metadata-webhook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ LABEL \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Webhook" \
io.k8s.description="Red Hat OpenShift Serverless Webhook" \
io.openshift.tags="webhook" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"

ENTRYPOINT ["/usr/bin/webhook"]
4 changes: 2 additions & 2 deletions test/images-rekt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
knative.dev/reconciler-test/cmd/eventshub: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-eventing-test-eventshub@sha256:e2d23c8fabf955bb7b1ce4b4c1b0ac31be1204f2db5aeda1cd4286d805704142
knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-eventing-heartbeats@sha256:3e36c70fec45a978ba40915fe7ed7f6d2c562a8c94c006860d43ae506369d6f2
knative.dev/reconciler-test/cmd/eventshub: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-eventing-test-eventshub@sha256:1594ed301c042a1eea44d0c0e4a1c32df4e3e34f2d34fb89bcb60e8ad0350157
knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-eventing-heartbeats@sha256:7ee0d52a3be92359349722133f08d35f92ec5ee47d6cff9f03a62a04661f5313
Loading