Skip to content

Conversation

@runcom
Copy link
Member

@runcom runcom commented Mar 26, 2019

This PR is further fixing https://bugzilla.redhat.com/show_bug.cgi?id=1677198 by
allowing an old cluster to contain links (coming from #535) which are
then removed when upgrading to post #540.

What's happening to QE is that:

  1. they're starting a cluster with an MCO version which contains Bug: 1686556: Symlink /root/.docker/config.json to kubelet auth #535
  2. they're upgrading to a payload which doesn't have Bug: 1686556: Symlink /root/.docker/config.json to kubelet auth #535 cause it has Use CRI-O’s pause_image_auth_file option #540 which reverts Bug: 1686556: Symlink /root/.docker/config.json to kubelet auth #535

The above means that point 1) generates MachineConfigs with an unsupported symlink and when
upgrading to 2), the symlink is removed causing drift and an unreconcilable error.

QE can start testing with a newer MCO version to avoid this, but for
ease of testing, let's add this snippet to make sure getting rid of
links, which we don't support anyway, just works.

Signed-off-by: Antonio Murdaca [email protected]

This PR is further fixing https://bugzilla.redhat.com/show_bug.cgi?id=1677198 by
allowing an old cluster to contain links (coming from openshift#535) which are
then removed when upgrading to post openshift#540.

What's happening to QE is that:

1) they're starting a cluster with an MCO version which contains openshift#535
2) they're upgrading to a payload which doesn't have openshift#535 cause it has openshift#540 which reverts openshift#535

The above means that point 1) generates MachineConfigs with an unsupported symlink and when
upgrading to 2), the symlink is removed causing drift and an unreconcilable error.

QE can start testing with a newer MCO version to avoid this, but for
ease of testing, let's add this snippet to make sure getting rid of
links, which we don't support anyway, just works.

Signed-off-by: Antonio Murdaca <[email protected]>
@runcom
Copy link
Member Author

runcom commented Mar 26, 2019

@cgwalters ptal

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 26, 2019
@runcom
Copy link
Member Author

runcom commented Mar 26, 2019

/retest

1 similar comment
@runcom
Copy link
Member Author

runcom commented Mar 26, 2019

/retest

@cgwalters
Copy link
Member

Software...fix one thing break another, always the story...

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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-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-merge-robot openshift-merge-robot merged commit 47cbc2d into openshift:master Mar 26, 2019
@runcom runcom deleted the fix-links-upgrade branch March 26, 2019 16:13
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.

5 participants