diff --git a/hack/generate/csv.sh b/hack/generate/csv.sh index 20e05aa05d..449188eec3 100755 --- a/hack/generate/csv.sh +++ b/hack/generate/csv.sh @@ -44,7 +44,7 @@ image "webhook" "${serving}-webhook" image "storage-version-migration-serving-serving-$(metadata.get dependencies.serving)__migrate" "${serving}-storage-version-migration" image "3scale-kourier-gateway" "docker.io/maistra/proxyv2-ubi8:$(metadata.get dependencies.maistra)" -image "3scale-kourier-control" "${registry}/knative-v$(metadata.get dependencies.kourier):kourier" +image "3scale-kourier-control" "docker.io/markusthoemmes/kourier-b74c3918b7eee585f87df62ccd297dc8:conflictfix" image "eventing-controller__eventing-controller" "${eventing}-controller" image "sugar-controller__controller" "${eventing}-sugar-controller" diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index cd58ef6c1f..f3613b8951 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -317,7 +317,7 @@ spec: - name: "IMAGE_3scale-kourier-gateway" value: "docker.io/maistra/proxyv2-ubi8:1.1.5" - name: "IMAGE_3scale-kourier-control" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.18.1:kourier" + value: "docker.io/markusthoemmes/kourier-b74c3918b7eee585f87df62ccd297dc8:conflictfix" - name: "IMAGE_eventing-controller__eventing-controller" value: "registry.svc.ci.openshift.org/openshift/knative-v0.18.4:knative-eventing-controller" - name: "IMAGE_sugar-controller__controller" @@ -426,7 +426,7 @@ spec: - name: "IMAGE_3scale-kourier-gateway" value: "docker.io/maistra/proxyv2-ubi8:1.1.5" - name: "IMAGE_3scale-kourier-control" - value: "registry.svc.ci.openshift.org/openshift/knative-v0.18.1:kourier" + value: "docker.io/markusthoemmes/kourier-b74c3918b7eee585f87df62ccd297dc8:conflictfix" - name: "IMAGE_eventing-controller__eventing-controller" value: "registry.svc.ci.openshift.org/openshift/knative-v0.18.4:knative-eventing-controller" - name: "IMAGE_sugar-controller__controller" @@ -697,7 +697,7 @@ spec: - name: "IMAGE_3scale-kourier-gateway" image: "docker.io/maistra/proxyv2-ubi8:1.1.5" - name: "IMAGE_3scale-kourier-control" - image: "registry.svc.ci.openshift.org/openshift/knative-v0.18.1:kourier" + image: "docker.io/markusthoemmes/kourier-b74c3918b7eee585f87df62ccd297dc8:conflictfix" - name: "IMAGE_eventing-controller__eventing-controller" image: "registry.svc.ci.openshift.org/openshift/knative-v0.18.4:knative-eventing-controller" - name: "IMAGE_sugar-controller__controller"