From 3f75ad8b2f55876302e176004f0ebdf968ef295e Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Thu, 11 Mar 2021 08:24:20 -0500 Subject: [PATCH] Fix registry url (registry.ci...) --- ...erless-operator.clusterserviceversion.yaml | 24 +++++++++---------- openshift/ci-operator/source-image/Dockerfile | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index b05c1b61c0..31740187d9 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -500,17 +500,17 @@ spec: - name: "IMAGE_KN_CLI_ARTIFACTS" value: "registry.ci.openshift.org/openshift/knative-v0.20.0:kn-cli-artifacts" - name: "KAFKA_IMAGE_kafka-controller-manager__manager" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-source-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-source-controller" - name: "KAFKA_IMAGE_KAFKA_RA_IMAGE" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-receive-adapter" + value: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-receive-adapter" - name: "KAFKA_IMAGE_kafka-ch-controller__controller" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-controller" + value: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-controller" - name: "KAFKA_IMAGE_DISPATCHER_IMAGE" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" + value: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" - name: "KAFKA_IMAGE_kafka-ch-dispatcher__dispatcher" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" + value: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" - name: "KAFKA_IMAGE_kafka-webhook__kafka-webhook" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-webhook" + value: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-webhook" - name: knative-openshift-ingress spec: replicas: 1 @@ -791,16 +791,16 @@ spec: - name: "IMAGE_KN_CLI_ARTIFACTS" image: "registry.ci.openshift.org/openshift/knative-v0.20.0:kn-cli-artifacts" - name: "KAFKA_IMAGE_kafka-controller-manager__manager" - image: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-source-controller" + image: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-source-controller" - name: "KAFKA_IMAGE_KAFKA_RA_IMAGE" - image: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-receive-adapter" + image: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-receive-adapter" - name: "KAFKA_IMAGE_kafka-ch-controller__controller" - image: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-controller" + image: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-controller" - name: "KAFKA_IMAGE_DISPATCHER_IMAGE" - image: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" + image: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" - name: "KAFKA_IMAGE_kafka-ch-dispatcher__dispatcher" - image: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" + image: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-consolidated-dispatcher" - name: "KAFKA_IMAGE_kafka-webhook__kafka-webhook" - image: "registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-webhook" + image: "registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-webhook" replaces: serverless-operator.v1.13.0 version: 1.14.0 diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile index 3ccd09b110..714559cdcc 100644 --- a/openshift/ci-operator/source-image/Dockerfile +++ b/openshift/ci-operator/source-image/Dockerfile @@ -1,8 +1,8 @@ FROM src COPY oc /usr/bin/oc -COPY --from=registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-serving-src /go/src/knative.dev/serving/ /go/src/knative.dev/serving/ -COPY --from=registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-src /go/src/knative.dev/eventing/ /go/src/knative.dev/eventing/ -COPY --from=registry.svc.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-src /go/src/knative.dev/eventing-kafka/ /go/src/knative.dev/eventing-kafka/ +COPY --from=registry.ci.openshift.org/openshift/knative-v0.20.0:knative-serving-src /go/src/knative.dev/serving/ /go/src/knative.dev/serving/ +COPY --from=registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-src /go/src/knative.dev/eventing/ /go/src/knative.dev/eventing/ +COPY --from=registry.ci.openshift.org/openshift/knative-v0.20.0:knative-eventing-kafka-src /go/src/knative.dev/eventing-kafka/ /go/src/knative.dev/eventing-kafka/ RUN chmod g+w /go/src/knative.dev/serving/ && chmod g+w /go/src/knative.dev/eventing/ && chmod g+w /go/src/knative.dev/eventing-kafka/