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

bootkube: Supply machine-os-content to MCO #1149

Merged

Conversation

cgwalters
Copy link
Member

Pass through the OS image the same way we do the others, to ensure
the rendered MachineConfig includes it.

Ref: openshift/machine-config-operator#334

@cgwalters
Copy link
Member Author

/hold

Pending MCO change.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 29, 2019
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 29, 2019
Pass through the OS image the same way we do the others, to ensure
the rendered MachineConfig includes it.

Ref: openshift/machine-config-operator#334
@cgwalters
Copy link
Member Author

Depends: openshift/machine-config-operator#355

@cgwalters
Copy link
Member Author

/hold cancel

Per openshift/machine-config-operator#363 (comment)

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 1, 2019
@cgwalters
Copy link
Member Author

Jan 29 23:18:25 ip-10-0-14-211 bootkube.sh[22043]: Error: unknown flag: --machine-config-oscontent-image

Yep, but that's now landed.

/test e2e-aws

@ashcrow
Copy link
Member

ashcrow commented Feb 4, 2019

Can we get a dev from the installer group review this? All lights are green :-)

@crawford
Copy link
Contributor

crawford commented Feb 4, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 4, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, crawford

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 Feb 4, 2019
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit d1e59b3 into openshift:master Feb 5, 2019
wking added a commit to wking/openshift-installer that referenced this pull request Feb 21, 2019
Since e2b31b2 (bootkube: Supply machine-os-content to MCO,
2019-01-29, openshift#1149), we have been using the machine-os-content image to
seed the machine-config operator.  With this commit, use the RHCOS
build ID from that image's annotations to calculate our AMI, etc. as
well.  This gives one less degree of freedom for breaking things ;).
Users who want to test clusters based on a different RHCOS build
should bump the value in their update payload, just like users testing
operator updates and other changes.

This is a WIP until I look into signature verification.
wking added a commit to wking/openshift-installer that referenced this pull request Mar 8, 2019
Since e2b31b2 (bootkube: Supply machine-os-content to MCO,
2019-01-29, openshift#1149), we have been using the machine-os-content image to
seed the machine-config operator.  With this commit, use the RHCOS
build ID from that image's annotations to calculate our AMI, etc. as
well.  This gives one less degree of freedom for breaking things ;).
Users who want to test clusters based on a different RHCOS build
should bump the value in their release image, just like users testing
operator updates and other changes.

The new pkg/asset/release subpackage allows users to continue using
pkg/rhcos without pulling in all of containers/image as a dependency.

This is a WIP until I look into signature verification.
wking added a commit to wking/openshift-installer that referenced this pull request Mar 8, 2019
Since e2b31b2 (bootkube: Supply machine-os-content to MCO,
2019-01-29, openshift#1149), we have been using the machine-os-content image to
seed the machine-config operator.  With this commit, use the RHCOS
build ID from that image's annotations to calculate our AMI, etc. as
well.  This gives one less degree of freedom for breaking things ;).
Users who want to test clusters based on a different RHCOS build
should bump the value in their release image, just like users testing
operator updates and other changes.

The new pkg/asset/release subpackage allows users to continue using
pkg/rhcos without pulling in all of containers/image as a dependency.

This is a WIP until I look into signature verification.
wking added a commit to wking/openshift-installer that referenced this pull request Mar 8, 2019
Since e2b31b2 (bootkube: Supply machine-os-content to MCO,
2019-01-29, openshift#1149), we have been using the machine-os-content image to
seed the machine-config operator.  With this commit, use the RHCOS
build ID from that image's annotations to calculate our AMI, etc. as
well.  This gives one less degree of freedom for breaking things ;).
Users who want to test clusters based on a different RHCOS build
should bump the value in their release image, just like users testing
operator updates and other changes.

The new pkg/asset/release subpackage allows users to continue using
pkg/rhcos without pulling in all of containers/image as a dependency.

This is a WIP until I look into signature verification.
wking added a commit to wking/openshift-installer that referenced this pull request Mar 9, 2019
Since e2b31b2 (bootkube: Supply machine-os-content to MCO,
2019-01-29, openshift#1149), we have been using the machine-os-content image to
seed the machine-config operator.  With this commit, use the RHCOS
build ID from that image's annotations to calculate our AMI, etc. as
well.  This gives one less degree of freedom for breaking things ;).
Users who want to test clusters based on a different RHCOS build
should bump the value in their release image, just like users testing
operator updates and other changes.

The new pkg/asset/release subpackage allows users to continue using
pkg/rhcos without pulling in all of containers/image as a dependency.

The pull-secret handling is a bit of a hack, leaning on the fact that
users are likely providing clean secrets from [1].  Hopefully soon
containers/image will grow an API for injecting in-memory bytes into
their more-robust Docker-auth-config parser, but my attempt at that
[2] is unlikely to land in the next few days, so I've cludged together
a minimal implementation here.

[1]: https://cloud.openshift.com/clusters/install#pull-secret
[2]: containers/image#588
wking added a commit to wking/openshift-installer that referenced this pull request Mar 10, 2019
Since e2b31b2 (bootkube: Supply machine-os-content to MCO,
2019-01-29, openshift#1149), we have been using the machine-os-content image to
seed the machine-config operator.  With this commit, use the RHCOS
build ID from that image's annotations to calculate our AMI, etc. as
well.  This gives one less degree of freedom for breaking things ;).
Users who want to test clusters based on a different RHCOS build
should bump the value in their release image, just like users testing
operator updates and other changes.

The new pkg/asset/release subpackage allows users to continue using
pkg/rhcos without pulling in all of containers/image as a dependency.

The pull-secret handling is a bit of a hack, leaning on the fact that
users are likely providing clean secrets from [1].  Hopefully soon
containers/image will grow an API for injecting in-memory bytes into
their more-robust Docker-auth-config parser, but my attempt at that
[2] is unlikely to land in the next few days, so I've cludged together
a minimal implementation here.

[1]: https://cloud.openshift.com/clusters/install#pull-secret
[2]: containers/image#588
wking added a commit to wking/openshift-installer that referenced this pull request Mar 12, 2019
Since e2b31b2 (bootkube: Supply machine-os-content to MCO,
2019-01-29, openshift#1149), we have been using the machine-os-content image to
seed the machine-config operator.  With this commit, use the RHCOS
build ID from that image's annotations to calculate our AMI, etc. as
well.  This gives one less degree of freedom for breaking things ;).
Users who want to test clusters based on a different RHCOS build
should bump the value in their release image, just like users testing
operator updates and other changes.

The new pkg/asset/release subpackage allows users to continue using
pkg/rhcos without pulling in all of containers/image as a dependency.

The pull-secret handling is a bit of a hack, leaning on the fact that
users are likely providing clean secrets from [1].  Hopefully soon
containers/image will grow an API for injecting in-memory bytes into
their more-robust Docker-auth-config parser, but my attempt at that
[2] is unlikely to land in the next few days, so I've cludged together
a minimal implementation here.

[1]: https://cloud.openshift.com/clusters/install#pull-secret
[2]: containers/image#588
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants