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

Fix related image environment variable discovery #5639

Merged

Conversation

ryantking
Copy link
Contributor

@ryantking ryantking commented Apr 7, 2022

The related image discovery feature currently only reads environment
variables from the manager container. This was causing an error when the
deployment labels or container name that was expected were not present.
This fixes that by collecting related images from all containers across
all deployments.

This change also enables users to use related images in other containers
since related images from everywhere will be considered.

Signed-off-by: Ryan King ryking@redhat.com

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 7, 2022
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 9, 2022
@ryantking ryantking force-pushed the bug/GH5574-custom-manager-name branch from 66e204f to dc99a42 Compare April 9, 2022 17:23
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 9, 2022
@ryantking ryantking changed the title Fix bug from hard-coded manager labels/name. Fix related image environment variable discovery Apr 9, 2022
@ryantking ryantking force-pushed the bug/GH5574-custom-manager-name branch 2 times, most recently from 8162309 to 55dfa37 Compare April 9, 2022 17:26
@ryantking ryantking marked this pull request as ready for review April 9, 2022 17:26
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 9, 2022
@ryantking ryantking force-pushed the bug/GH5574-custom-manager-name branch 2 times, most recently from b916f3d to 0b1e41c Compare April 9, 2022 21:57
@everettraven
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2022
Copy link
Member

@jmrodri jmrodri left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2022
@ryantking ryantking force-pushed the bug/GH5574-custom-manager-name branch from 3015115 to 13001fc Compare April 12, 2022 16:27
@jmrodri
Copy link
Member

jmrodri commented Apr 12, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2022
@jmrodri
Copy link
Member

jmrodri commented Apr 13, 2022

@ryantking crap, I think this needs a changelog.

The related image discovery feature currently only reads environment
variables from the manager container. This was causing an error when the
deployment labels or container name that was expected were not present.
This fixes that by collecting related images from all containers across
all deployments.

This change also enables users to use related images in other containers
since related images from everywhere will be considered.

Signed-off-by: Ryan King <ryking@redhat.com>
@ryantking ryantking force-pushed the bug/GH5574-custom-manager-name branch from 13001fc to 58e91a5 Compare April 13, 2022 03:41
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2022
@jmrodri
Copy link
Member

jmrodri commented Apr 13, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2022
@ryantking ryantking merged commit fb15b62 into operator-framework:master Apr 13, 2022
@ryantking ryantking deleted the bug/GH5574-custom-manager-name branch April 13, 2022 13:36
@ryantking
Copy link
Contributor Author

/cherry-pick v1.19.x

@openshift-cherrypick-robot

@ryantking: new pull request created: #5656

In response to this:

/cherry-pick v1.19.x

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

VenkatRamaraju pushed a commit to VenkatRamaraju/operator-sdk that referenced this pull request May 18, 2022
…5639)

The related image discovery feature currently only reads environment
variables from the manager container. This was causing an error when the
deployment labels or container name that was expected were not present.
This fixes that by collecting related images from all containers across
all deployments.

This change also enables users to use related images in other containers
since related images from everywhere will be considered.

Signed-off-by: Ryan King <ryking@redhat.com>
Signed-off-by: Venkat Ramaraju <vramaraj@redhat.com>
VenkatRamaraju pushed a commit to VenkatRamaraju/operator-sdk that referenced this pull request May 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants