Skip to content

MGMT-2454 Remove patch for unsupported etcd flag for versions >= 4.7#115

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
carbonin:remove_etcd_patch
Dec 16, 2020
Merged

MGMT-2454 Remove patch for unsupported etcd flag for versions >= 4.7#115
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
carbonin:remove_etcd_patch

Conversation

@carbonin
Copy link
Member

@carbonin carbonin commented Nov 23, 2020

Going forward we will use a marker file written to the bootstrap
node. This is implemented in the service in openshift/assisted-service#672
and the etcd operator in openshift/cluster-etcd-operator#449

We also need to consider what version of openshift will contain the
etcd operator enhancement we require before merging this.

Fixes MGMT-2454
Alternative to #47

@carbonin carbonin requested a review from eranco74 November 23, 2020 21:23
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 23, 2020
@carbonin
Copy link
Member Author

/hold until we are using a cluster version including openshift/cluster-etcd-operator#449

@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 Nov 24, 2020
@carbonin carbonin changed the title MGMT-2454 Remove patch for unsupported etcd flag MGMT-2454 Remove patch for unsupported etcd flag for versions >= 4.7 Dec 14, 2020
@carbonin
Copy link
Member Author

Made this conditional on the version we're installing. Will unhold when I test with both 4.6 and 4.7

@romfreiman
Copy link

Please add a UT with 4.6.6 and 4.7.5 (just to verify patch releases are working).

@romfreiman
Copy link

Btw, lets not affect the current flow - meaning if this code will be deployed to the cloud now - will it work? Or it will require marking somewhere that it installs 4.6. If it wild require extra changes, then - not good 👎

@carbonin
Copy link
Member Author

meaning if this code will be deployed to the cloud now - will it work?

I thought it would, but I'm hitting some issues running test infra. I'll know for sure tomorrow.

@carbonin
Copy link
Member Author

Verified that this doesn't break 4.6, but waiting on the 4.7 MCO issue to continue testing that.

Going forward we will use a marker file written to the bootstrap
node. This is implemented in the service in  openshift/assisted-service#672
and the etcd operator in openshift/cluster-etcd-operator#449

Fixes MGMT-2454
@carbonin
Copy link
Member Author

Also just validated on 4.7 with nightly release 4.7.0-0.nightly-2020-12-10-202001

Validated that we didn't path or unpatch as well.

# grep -Rn "Skipping etcd" *
logs_host_f8384dab-5526-4418-a7e1-13e23bc331ce/installer.logs:406:Dec 16 19:53:33 test-infra-cluster-assisted-installer-master-1 installer[3042]: time="2020-12-16T19:53:33Z" level=info msg="Skipping etcd patch for cluster version 4.7"
# oc logs -n assisted-installer  assisted-installer-controller-wfc8f | grep "Skipping etcd unpatch"
time="2020-12-16T20:08:53Z" level=info msg="Skipping etcd unpatch for cluster version 4.7"

/unhold

Any other concerns @romfreiman @YuviGold @eranco74 ?

@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 Dec 16, 2020
@romfreiman
Copy link

/lgtm

@romfreiman
Copy link

/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carbonin, romfreiman

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:
  • OWNERS [carbonin,romfreiman]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit c799e7d into openshift:master Dec 16, 2020
@YuviGold YuviGold mentioned this pull request Dec 17, 2020
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.

4 participants