Skip to content

DO NOT MERGE debug 1474 #2#1676

Closed
runcom wants to merge 9 commits intoopenshift:masterfrom
runcom:debign3-2
Closed

DO NOT MERGE debug 1474 #2#1676
runcom wants to merge 9 commits intoopenshift:masterfrom
runcom:debign3-2

Conversation

@runcom
Copy link
Copy Markdown
Member

@runcom runcom commented Apr 23, 2020

/hold

kikisdeliveryservice and others added 9 commits April 22, 2020 09:22
@kikisdeliveryservice
mcc: vendor ign3 types & run make go-deps
2eb3a4c
@kikisdeliveryservice
mcc: update ValidateIgnition() to check v2 and v3
d2d44ef 
also vendor, make go-deps & update unit tests for ignv2&v3
@kikisdeliveryservice
mcc: add convertIgnition3to2() to translate IgnV3 to IgnV2
581edfe 
also make go-deps to cover import
@kikisdeliveryservice
mcc: add convertIgnition3to2() unit test
cb55c56
@kikisdeliveryservice
mcc: add IgnParseWrapper(), make go-deps, add unit test
65f5933 
IgnParseWrapper wraps the two different ignition V2 & V3 parse functions
that are used to translate a Machine Config's Spec.Config.Raw (ignition
stored as []byte).
@kikisdeliveryservice
mcc: use IgnParseWrapper() & convertIgnition3to2 in MergeMachineConfi…
acc4715 
…gs()

Parse raw ignition configs and translate all ignition V3 configs down to V2
for use in the rendered config while preserving the original V3 config.
@kikisdeliveryservice
e2e: Add test to verify ign3configs
172ce77
@kikisdeliveryservice
manifests: update machineconfig crd & bindata
d922209
@runcom
pkg/daemon: fix updateSSHKeys
b968b46 
Use all available keys all the time, not just last one.
This makes sure the operation can be repeated over and over
and won't depend on ordering either...

Signed-off-by: Antonio Murdaca <runcom@linux.com>
@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 Apr 23, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 23, 2020
@runcom runcom mentioned this pull request Apr 23, 2020
Merged
@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 23, 2020

/refresh

@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 23, 2020

/skip

@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 23, 2020

/test e2e-aws

yuqi-zhang
yuqi-zhang approved these changes Apr 23, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

This approach makes sense to me! Good catch. Please update the comment for clarity

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Apr 23, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: runcom, yuqi-zhang

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

@runcom
Copy link
Copy Markdown
Member Author

runcom commented Apr 23, 2020

updated the commit for clarity in Kirsten's PR directly, closing this now

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Apr 23, 2020

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

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 b968b46 link /test e2e-aws-scaleup-rhel7
ci/prow/e2e-aws b968b46 link /test e2e-aws

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.

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.

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

kikisdeliveryservice commented Apr 23, 2020

We dont need this anymore =)

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

Reviewers

@yuqi-zhang yuqi-zhang yuqi-zhang approved these changes

@kikisdeliveryservice kikisdeliveryservice Awaiting requested review from kikisdeliveryservice

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@runcom @openshift-ci-robot @kikisdeliveryservice @yuqi-zhang