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

Have the MCO manage the ignition stub config #3730

Merged
merged 1 commit into from Aug 1, 2020

Conversation

runcom
Copy link
Member

@runcom runcom commented Jun 9, 2020

Completely WIP right now and won't even pass tests. I need this PR to further testing, launching clusters with openshift/machine-config-operator#1792

This turned out to be working with openshift/machine-config-operator#1792 - I'm now doing further testing and creating the enhancement to get the MCO PR in first and then this one

We need to change the name of the Secret so the MCO can recompute it with the very same name we're using. We need the naming change because when we upgrade, we want to leave the old worker|master-user-data around for old MachineSets to still use the old ignition types.

We need the installer to start using https://github.com/openshift/machine-config-operator/pull/1792/files#diff-5926e0cec606d949b66f823310790298R136 so we manage that snippet from the MCO as well.

Signed-off-by: Antonio Murdaca runcom@linux.com

@runcom
Copy link
Member Author

runcom commented Jun 9, 2020

This would break UPI tho as we're not generating ignition configs anymore, will have to think more about this.

@runcom
Copy link
Member Author

runcom commented Jun 11, 2020

/retest

x
Signed-off-by: Antonio Murdaca <runcom@linux.com>
@runcom runcom changed the title WIP Have the MCO manage the ignition stub config Have the MCO manage the ignition stub config Jul 27, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 27, 2020
@runcom
Copy link
Member Author

runcom commented Jul 27, 2020

@abhinavdahiya @yuqi-zhang ptal - this is needed as the MCO counterpart has been merged already

@runcom
Copy link
Member Author

runcom commented Jul 27, 2020

/retest

1 similar comment
@yuqi-zhang
Copy link
Contributor

/retest

@yuqi-zhang
Copy link
Contributor

I'm /approve on the change but 2 items:

  1. are these two files the only location where we reference these secret names? Is any other UPI setup referencing these?
  2. we'd also have to remember to update docs e.g. https://docs.openshift.com/container-platform/4.5/machine_management/creating_machinesets/creating-machineset-aws.html#machineset-yaml-aws_creating-machineset-aws to account for the change, since we're envisioning for ignition spec 3 we will no longer have master/worker-user-data (non-managed) at all

@runcom
Copy link
Member Author

runcom commented Jul 28, 2020

I'm /approve on the change but 2 items:

  1. are these two files the only location where we reference these secret names? Is any other UPI setup referencing these?

I'm pretty sure that's what UPI consumes yeah, those I can only see when generating the manifests - @abhinavdahiya can you confirm?

  1. we'd also have to remember to update docs e.g. https://docs.openshift.com/container-platform/4.5/machine_management/creating_machinesets/creating-machineset-aws.html#machineset-yaml-aws_creating-machineset-aws to account for the change, since we're envisioning for ignition spec 3 we will no longer have master/worker-user-data (non-managed) at all

ack, thx for pointing that out, I'll take an action on it

@runcom
Copy link
Member Author

runcom commented Jul 29, 2020

/retest

@runcom
Copy link
Member Author

runcom commented Jul 30, 2020

/assign abhinavdahiya

@abhinavdahiya
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2020
@yuqi-zhang
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@runcom
Copy link
Member Author

runcom commented Jul 31, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link
Contributor

@runcom: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-ovirt 8d278d2 link /test e2e-ovirt
ci/prow/e2e-openstack 8d278d2 link /test e2e-openstack
ci/prow/e2e-crc 8d278d2 link /test e2e-crc

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-merge-robot openshift-merge-robot merged commit 2f8b52e into openshift:master Aug 1, 2020
@runcom runcom deleted the userdata-managed branch August 2, 2020 17:29
enxebre added a commit to enxebre/machine-api-operator that referenced this pull request Aug 3, 2020
This openshift/installer#3730 changed the name of the userdata generated by the installer to satisfy MCO ign v2 -> v3 migration and let the new secret be under mco management. openshift/enhancements#368.
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

6 participants