Skip to content

[release-1.22] Override version migration images#1594

Merged
openshift-merge-robot merged 3 commits into
openshift-knative:release-1.22from
mgencur:override_version_migration_images
Jun 7, 2022
Merged

[release-1.22] Override version migration images#1594
openshift-merge-robot merged 3 commits into
openshift-knative:release-1.22from
mgencur:override_version_migration_images

Conversation

@mgencur
Copy link
Copy Markdown
Contributor

@mgencur mgencur commented May 31, 2022

Fixes https://issues.redhat.com/browse/SRVCOM-1875

I'd send the same against main and release-1.23 when this PR is merged.

Proposed Changes

  • Pull storage-version-migration images after upgrade from internal (or quay) registry to ensure that the Job spec changes after upgrade even if Knative version remains same.

@mgencur
Copy link
Copy Markdown
Contributor Author

mgencur commented Jun 1, 2022

Hitting https://bugzilla.redhat.com/show_bug.cgi?id=2087767 when using the internal registry. The Knative Kafka pods don't have the right pull secrets in time when they're created.

@mgencur mgencur force-pushed the override_version_migration_images branch from e508a17 to 1208e77 Compare June 1, 2022 06:13
@mgencur
Copy link
Copy Markdown
Contributor Author

mgencur commented Jun 1, 2022

/retest

@mgencur
Copy link
Copy Markdown
Contributor Author

mgencur commented Jun 1, 2022

/test 4.10-upgrade-tests-aws-ocp-410

1 similar comment
@mgencur
Copy link
Copy Markdown
Contributor Author

mgencur commented Jun 2, 2022

/test 4.10-upgrade-tests-aws-ocp-410

@mgencur mgencur force-pushed the override_version_migration_images branch from 1208e77 to a851710 Compare June 2, 2022 07:17
@mgencur mgencur changed the title [WIP] Override version migration images [release-1.22] Override version migration images Jun 2, 2022
@mgencur
Copy link
Copy Markdown
Contributor Author

mgencur commented Jun 2, 2022

The single failure doesn't look related.

@matzew
Copy link
Copy Markdown
Member

matzew commented Jun 3, 2022

@mgencur what's the status here?

@mgencur
Copy link
Copy Markdown
Contributor Author

mgencur commented Jun 3, 2022

@matzew Ready for review/merge.

# Get all storage version migration images.
while IFS=$'\n' read -r line; do
images+=("$line");
done < <(grep storage-version-migration "$csv" | grep "image:" | awk '{ print $2 }' | awk -F"\"" '{ print $2 }')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for eventing-kafka-broker, we use an additional pattern for an additional post-install job

- name: "KAFKA_IMAGE_kafka-controller-post-install__post-install"
value: "registry.ci.openshift.org/openshift/knative-v1.2.3:knative-eventing-kafka-broker-post-install"
, can we include that as well?

while reviewing this PR, I found that we are not mirroring these images yet (fixed in openshift/release#29177) so if we want to do this for the next release branches only, that's fine too.

Copy link
Copy Markdown
Contributor Author

@mgencur mgencur Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not include this pod/job in the checks because we haven't had problems with it, it already contains the product version, not upstream component versions (see below 1.23.0). So for each release the name will be different:

pod/kafka-controller-post-install-1.23.0--1-6vc5z

So, I think it's not necessary to include it. But let me know if you really want it to be added.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thanks!

/lgtm

@pierDipi
Copy link
Copy Markdown
Member

pierDipi commented Jun 6, 2022

/test 4.10-upstream-e2e-aws-ocp-410

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 7, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgencur, pierDipi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 913380b into openshift-knative:release-1.22 Jun 7, 2022
@mgencur
Copy link
Copy Markdown
Contributor Author

mgencur commented Jun 7, 2022

@pierDipi thanks for review! I will send that to 1.23 and main as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants