Skip to content

Add fallback for mco flags#1781

Merged
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
enxebre:backward-compatible-flags
Oct 4, 2022
Merged

Add fallback for mco flags#1781
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
enxebre:backward-compatible-flags

Conversation

@enxebre
Copy link
Copy Markdown
Member

@enxebre enxebre commented Oct 4, 2022

What this PR does / why we need it:
When the CPO is at N and the NodePool.spec.release at N-1 we fail to render ignition payload because openshift/machine-config-operator#3286 broke backward compatibility. This PRs lets it fall back to MCO previously supported flags.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

@enxebre
Copy link
Copy Markdown
Member Author

enxebre commented Oct 4, 2022

/hold
supersedes #1778

@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 Oct 4, 2022
@openshift-ci openshift-ci Bot requested review from csrwng and sjenning October 4, 2022 06:59
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

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-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 4, 2022
fmt.Sprintf("--dns-config-file=%s/cluster-dns-02-config.yaml", configDir),
fmt.Sprintf("--pull-secret=%s/pull-secret.yaml", configDir),
fmt.Sprintf("--dest-dir=%s", destDir),
fmt.Sprintf("--additional-trust-bundle-config-file=%s/user-ca-bundle-config.yaml", configDir),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks like we would skip the logic in lines 255-263.

When the CPO is at N and the NodePool.spec.release at N-1 we fail to render ignition payload because openshift/machine-config-operator#3286 broke backward compatibility.
This PRs lets it fall back to MCO previously supported flags.
@enxebre enxebre force-pushed the backward-compatible-flags branch from 2462416 to 293d724 Compare October 4, 2022 09:19
@csrwng
Copy link
Copy Markdown
Contributor

csrwng commented Oct 4, 2022

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2022
@enxebre enxebre mentioned this pull request Oct 4, 2022
4 tasks
@csrwng
Copy link
Copy Markdown
Contributor

csrwng commented Oct 4, 2022

/retest-required

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 4, 2022

@enxebre: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/capi-provider-agent-sanity 293d724 link false /test capi-provider-agent-sanity

Full PR test history. Your PR dashboard.

Details

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.

@csrwng
Copy link
Copy Markdown
Contributor

csrwng commented Oct 4, 2022

/hold cancel

@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 Oct 4, 2022
@openshift-merge-robot openshift-merge-robot merged commit bbff16b into openshift:main Oct 4, 2022
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.

3 participants