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.

Sign up for GitHub

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

Jump to bottom

[WIP] * : Ignition v2 to v3 transition #583

Closed
wants to merge 2 commits into from
Closed

[WIP] * : Ignition v2 to v3 transition #583

wants to merge 2 commits into from

Conversation

kikisdeliveryservice
Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice commented Mar 26, 2019 •
edited
Loading

Updating MC* to use ignition v3. The following changes are included:

  • ssh keys now written to /home/core/.ssh/authorized_keys.d/ignition
  • code changes to use v3 and remove usage of v2.2.0
  • unit and e2e test updates
  • updated golden files
  • remove the use of container-linux-config-transpiler in render.go and
    use v3 types instead
  • vendor bump (incl: updating ignition version and removing contaniner-linux-config-transpiler)

Requires: openshift/installer#1468

Closes #565

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 26, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kikisdeliveryservice

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:
  • OWNERS [kikisdeliveryservice]

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 Mar 26, 2019
rphillips
rphillips reviewed Mar 26, 2019
View reviewed changes
pkg/daemon/update.go Outdated Show resolved Hide resolved
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 26, 2019
runcom
runcom reviewed Mar 27, 2019
View reviewed changes
Gopkg.toml
[[constraint]]
name = "github.com/coreos/ignition"
version = "0.26.0"
branch = "master"
Copy link
Member

Choose a reason for hiding this comment

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

we can now use 2.0.0-alpha tag iirc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah ok i was following your installer pr

@runcom
Copy link
Member

runcom commented Mar 27, 2019

awesome 😍

@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Mar 27, 2019
Merged
@kikisdeliveryservice
Copy link
Contributor Author

looks like I'm seeing similar problems in TestKubeletConfigCreate as #417
#417 (comment)

@eparis
Copy link
Member

eparis commented Mar 29, 2019

/hold
as this PR (in conjunction with the others) would, as I understand it, break upgrades it may not merge during the customer promised beta3 upgrade window.

@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 Mar 29, 2019
@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Mar 29, 2019
Closed
@kikisdeliveryservice kikisdeliveryservice changed the title WIP update ign v2 -> v3 [WIP] Ignition v2 to v3 transition Mar 29, 2019
@kikisdeliveryservice kikisdeliveryservice changed the title [WIP] Ignition v2 to v3 transition [WIP] * : Ignition v2 to v3 transition Mar 29, 2019
ajeddeloh
ajeddeloh reviewed Mar 29, 2019
View reviewed changes
Copy link

@ajeddeloh ajeddeloh left a comment

Choose a reason for hiding this comment

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

Does this drop the special handling with ssh keys? Merge() should be doing the right thing now.

docs/MachineConfigServer.md Outdated Show resolved Hide resolved
pkg/apis/machineconfiguration.openshift.io/v1/helpers.go Show resolved Hide resolved
pkg/controller/container-runtime-config/container_runtime_config_controller.go Outdated Show resolved Hide resolved
pkg/controller/template/render.go Show resolved Hide resolved
pkg/controller/template/test_data/templates/master/00-master/aws/files/-etc-kubernetes-ca.crt Show resolved Hide resolved
pkg/controller/template/test_data/templates/master/00-master/aws/files/-etc-kubernetes-ca.crt Show resolved Hide resolved
@kikisdeliveryservice
Copy link
Contributor Author

Does this drop the special handling with ssh keys? Merge() should be doing the right thing now.

special handling?

@kikisdeliveryservice
Copy link
Contributor Author

Going to look into the SSH stuff after talking to @ajeddeloh

@ajeddeloh
Copy link

Summarizing some discussion: The SSH stuff is not needed for this and is just cleanup, so we'll keep it out of this PR to clean the number of variables small.

@kikisdeliveryservice
Ignition v2 to v3 transition
2fcadf8 
Updating MC* to use ignition v3. The following changes are included:
- ssh keys now written to /home/core/.ssh/authorized_keys.d/ignition
- code changes to use v3 and remove usage of v2.2.0
- unit and e2e test updates
- updated golden files
- remove the use of container-linux-config-transpiler in render.go and
  use v3 types instead

Requires: openshift/installer#1468
Closes: openshift#565
@kikisdeliveryservice
Ignition v2 to v3 transition : Vendor Bump
afc54e8
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 2, 2019
@openshift-ci-robot
Copy link
Contributor

@kikisdeliveryservice: PR needs rebase.

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.

@kikisdeliveryservice kikisdeliveryservice mentioned this pull request Apr 9, 2019
Merged
@wking wking mentioned this pull request Apr 30, 2019
Closed
@openshift-ci-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
ci/prow/e2e-aws afc54e8 link /test e2e-aws
ci/prow/e2e-aws-op afc54e8 link /test e2e-aws-op
ci/prow/e2e-aws-disruptive afc54e8 link /test e2e-aws-disruptive
ci/prow/e2e-gcp-op afc54e8 link /test e2e-gcp-op
ci/prow/e2e-aws-upgrade afc54e8 link /test e2e-aws-upgrade
ci/prow/e2e-gcp-upgrade afc54e8 link /test e2e-gcp-upgrade
ci/prow/e2e-vsphere afc54e8 link /test e2e-vsphere
ci/prow/build-rpms-from-tar afc54e8 link /test build-rpms-from-tar

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@kikisdeliveryservice kikisdeliveryservice added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 3, 2019
@kikisdeliveryservice
Copy link
Contributor Author

In an effort to clean up the MCO repo, closing old open PRs with no recent activity.

Feel free to reopen.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LorbusChris LorbusChris LorbusChris left review comments

@ajeddeloh ajeddeloh ajeddeloh left review comments

@runcom runcom runcom left review comments

@rphillips rphillips rphillips left review comments

@ashcrow ashcrow Awaiting requested review from ashcrow

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

mcc: replace cttypes with ign v3 types
8 participants
@kikisdeliveryservice @openshift-ci-robot @runcom @cgwalters @ajeddeloh @eparis @rphillips @LorbusChris