Skip to content
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.

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

[release-v1.0] Fix wrong image names in generated manifests #532

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion openshift/release/generate-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "$release" == "ci" ]; then
image_prefix="registry.ci.openshift.org/openshift/knative-nightly:knative-eventing-kafka-"
tag=""
else
image_prefix="registry.ci.openshift.org/openshift/knative-${release}:knative-eventing-kafka-"
image_prefix="registry.ci.openshift.org/openshift/${release}:knative-eventing-kafka-"
tag=""
fi

Expand Down
6 changes: 3 additions & 3 deletions openshift/release/knative-eventing-kafka-channel-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ spec:
serviceAccountName: kafka-ch-controller
containers:
- name: controller
image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-consolidated-controller
image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-consolidated-controller
env:
- name: CONFIG_LOGGING_NAME
value: config-logging
Expand All @@ -683,7 +683,7 @@ spec:
- name: CONFIG_LEADERELECTION_NAME
value: config-leader-election
- name: DISPATCHER_IMAGE
value: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-consolidated-dispatcher
value: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-consolidated-dispatcher
- name: SERVICE_ACCOUNT
value: kafka-ch-dispatcher
ports:
Expand Down Expand Up @@ -752,7 +752,7 @@ spec:
containers:
- name: kafka-webhook
terminationMessagePolicy: FallbackToLogsOnError
image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-webhook
image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-webhook
env:
- name: SYSTEM_NAMESPACE
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ spec:
restartPolicy: OnFailure
containers:
- name: migrate
image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-migrate
image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-migrate
args:
- "kafkachannels.messaging.knative.dev"
4 changes: 2 additions & 2 deletions openshift/release/knative-eventing-kafka-source-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ spec:
serviceAccountName: kafka-controller-manager
containers:
- name: manager
image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-source-controller
image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-source-controller
env:
- name: SYSTEM_NAMESPACE
valueFrom:
Expand All @@ -356,7 +356,7 @@ spec:
- name: CONFIG_LEADERELECTION_NAME
value: config-leader-election
- name: KAFKA_RA_IMAGE
value: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-receive-adapter
value: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-receive-adapter
volumeMounts:
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ spec:
restartPolicy: OnFailure
containers:
- name: migrate
image: registry.ci.openshift.org/openshift/knative-knative-v1.0.0:knative-eventing-kafka-migrate
image: registry.ci.openshift.org/openshift/knative-v1.0.0:knative-eventing-kafka-migrate
args:
- "kafkasources.messaging.knative.dev"