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

[OCPCLOUD-1162] Implement image substitution for Pod and generalise the approach for other objects #58

Merged

Conversation

Danil-Grigorev
Copy link
Contributor

@Danil-Grigorev Danil-Grigorev commented Jun 15, 2021

This will add support for image substitution in static pod, used in render implementation.

@openshift-ci openshift-ci bot requested review from JoelSpeed and mdbooth June 15, 2021 13:01
Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

LGTM, got a couple of nits, LMK if you disagree

pkg/substitution/substitution.go Outdated Show resolved Hide resolved
pkg/substitution/substitution.go Outdated Show resolved Hide resolved
@Danil-Grigorev Danil-Grigorev changed the title Implement image substitution for Pod and generalise the approach for other objects [OCPCLOUD-1162] Implement image substitution for Pod and generalise the approach for other objects Jun 16, 2021
@Danil-Grigorev
Copy link
Contributor Author

@JoelSpeed The PR is ready, but we can't merge it just yet, or we risk destroying our CI once openshift/installer#4947 is merged, just after operator is added to release. We need to add all supported provider forks into release first, then merge this PR. Currently it is Azure and AWS.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 16, 2021
Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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

The pull request process is described here

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2021
@JoelSpeed
Copy link
Contributor

@JoelSpeed The PR is ready, but we can't merge it just yet, or we risk destroying our CI once openshift/installer#4947 is merged, just after operator is added to release. We need to add all supported provider forks into release first, then merge this PR. Currently it is Azure and AWS.

@Danil-Grigorev I don't see how this PR would affect that specifically? Does the operator not wait until there is a feature gate present before doing anything? I would have thought during bootstrap it would also only generate a pod if the FG is present or it knows that platform is specifically GA'd as out of tree? Did we change what we are doing here?

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 16, 2021

@Danil-Grigorev: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-ccm c60a1e9 link /test e2e-aws-ccm

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2021
@Danil-Grigorev
Copy link
Contributor Author

Danil-Grigorev commented Jun 23, 2021

/hold cancel

It is safe to merge, as the operator could not be added to release before each provider is added.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 23, 2021
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2021
@lobziik
Copy link
Contributor

lobziik commented Jun 23, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2021
@openshift-merge-robot openshift-merge-robot merged commit 3832ff4 into openshift:master Jun 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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

4 participants