Skip to content

Conversation

@jboxman
Copy link
Contributor

@jboxman jboxman commented Feb 8, 2019

The goal of this PR is to address the issue described in the bug linked above and described succinctly in this[0] solution. I'd appreciate suggestions on better ways to surface this information. I included it under 3. rather than 2. because it affects upgrading z-stream releases as well.

Thank you.

[0] https://access.redhat.com/solutions/3811271

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 8, 2019
@jboxman
Copy link
Contributor Author

jboxman commented Feb 8, 2019

@openshift/team-documentation PTAL, thanks.

@jboxman jboxman added peer-review-needed Signifies that the peer review team needs to review this PR branch/enterprise-3.10 branch/enterprise-3.11 labels Feb 8, 2019
@jboxman jboxman added this to the Next Release milestone Feb 8, 2019
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd say:

If you manually manage the cluster's *_/etc/origin/master/htpasswd_* file, add
`openshift_master_manage_htpasswd=false` to your inventory file to prevent the
upgrade process from overwriting the *_htpasswd_* file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I like that, thanks!

Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

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

I'd reword the change, but it LGTM

@kalexand-rh kalexand-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 8, 2019
@openshift-docs-preview-bot

The preview will be availble shortly at:

@jboxman
Copy link
Contributor Author

jboxman commented Feb 14, 2019

@openshift/team-documentation, this PR is approved in the BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1666644#c8

If that is sufficient, I can merge this. Thanks.

@kalexand-rh
Copy link
Contributor

@jboxman, yup! After you make updates from peer review and QE review, you're good to merge and cherry-pick.

@jboxman
Copy link
Contributor Author

jboxman commented Feb 20, 2019

Verified by QE[0].

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1666644#c10

@jboxman jboxman merged commit 9f023e6 into openshift:master Feb 20, 2019
@jboxman
Copy link
Contributor Author

jboxman commented Feb 20, 2019

/cherrypick enterprise-3.11

@openshift-cherrypick-robot

@jboxman: new pull request created: #13676

Details

In response to this:

/cherrypick enterprise-3.11

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.

@jboxman
Copy link
Contributor Author

jboxman commented Feb 20, 2019

/cherrypick enterprise-3.10

@openshift-cherrypick-robot

@jboxman: #13586 failed to apply on top of branch "enterprise-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	upgrading/automated_upgrades.adoc
Falling back to patching base and 3-way merge...
Auto-merging upgrading/automated_upgrades.adoc
CONFLICT (content): Merge conflict in upgrading/automated_upgrades.adoc
Patch failed at 0001 Reveal openshift_master_manage_htpasswd variable in upgrade preparations

Details

In response to this:

/cherrypick enterprise-3.10

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.

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

Labels

branch/enterprise-3.5 branch/enterprise-3.6 branch/enterprise-3.7 branch/enterprise-3.9 branch/enterprise-3.10 branch/enterprise-3.11 peer-review-done Signifies that the peer review team has reviewed this PR 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