Skip to content

BZ1850510 - remove NFS from image reg docs #25826

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
Merged
bobfuru merged 1 commit into from
Oct 15, 2020
Merged

BZ1850510 - remove NFS from image reg docs #25826

bobfuru merged 1 commit into from
Oct 15, 2020

Conversation

@bobfuru
Copy link
Contributor

@bobfuru bobfuru commented Sep 28, 2020 •
edited
Loading

This work updates content that was added in #24276 and is a continuation of BZ 1850510. Based on consultation with @huffmanca, this PR:

  • Removes NFS references throughout bare metal and vsphere registry storage docs.
  • Updates the notes that begin with, "When using shared storage..." and reworded these to say, "When using shared storage review your security settings to prevent outside access".
  • Updates the procedures that previously had references to NFS and RWX. For vSphere, I used the PV/PVC examples from https://docs.openshift.com/container-platform/4.4/storage/persistent_storage/persistent-storage-vsphere.html
  • Removes xrefs to NFS Group IDs topic.
  • Updates the prereqs note about provisioned storage in both vSphere and bare metal to indicate new functionality introduced in 4.4 that supports RWO if you have only one replica. Hence, this PR will be CP'ed only back to 4.4.

Preview links:

@bobfuru bobfuru added this to the Next Release milestone Sep 28, 2020
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 28, 2020
@openshift-docs-preview-bot
Copy link

openshift-docs-preview-bot commented Sep 28, 2020

The preview will be available shortly at:

@bobfuru
Copy link
Contributor Author

bobfuru commented Sep 28, 2020

@huffmanca PTAL, thank you!

@bobfuru
Copy link
Contributor Author

bobfuru commented Sep 28, 2020

@qinpingli PTAL for QE, especially in the PV/PVC examples that were updated, thanks!

qinpingli
qinpingli reviewed Sep 29, 2020
View reviewed changes
qinpingli
qinpingli reviewed Sep 29, 2020
View reviewed changes
qinpingli
qinpingli reviewed Sep 29, 2020
View reviewed changes
qinpingli
qinpingli reviewed Sep 29, 2020
View reviewed changes
qinpingli
qinpingli reviewed Sep 29, 2020
View reviewed changes
@wzheng1
Copy link

wzheng1 commented Sep 29, 2020 •
edited
Loading

All in all, Image registry support both RWX and RWO pvc, no matter the PVC is using what kind of storage backend.

For RWX pvc, Image registry is hardcoded to use RWX+100Gi PVC which can be auto-created if user configure config.imageregistry to spec.pvc.claim(leave the name blank);

For RWO pvc which is usually used on barematal and vsphere cluster, user has to a create it first and make sure it can be auto-attached to a PV; b. Input the created pvc's name to spec.pvc.claim in config.imageregistry, and change spec.rolloutStrategy=Recreate;

@bobfuru
Copy link
Contributor Author

bobfuru commented Sep 29, 2020

For RWO pvc which is usually used on barematal and vsphere cluster, user has to a create it first and make sure it can be auto-attached to a PV; b. Input the created pvc's name to spec.pvc.claim in config.imageregistry, and change spec.rolloutStrategy=Recreate;

I had already added a procedure for configuring RWO block registry storage for vSphere as part of #24043. However, that PR did not add the procedure to the bare metal docs.

I've now updated the bare metal docs to also include the same RWO procedure ("Configuring block registry storage"). Please verify that this is correct, @wzheng1?

@bobfuru bobfuru force-pushed the BZ1850510-update branch 2 times, most recently from 81c7981 to 8b69ee9 Compare September 29, 2020 20:58
@bobfuru bobfuru mentioned this pull request Sep 29, 2020
Merged
@bobfuru
Copy link
Contributor Author

bobfuru commented Sep 29, 2020

@bmcelvee - wanted you to know this PR is currently under review as part of BZ 1850510.

wzheng1
wzheng1 reviewed Sep 30, 2020
View reviewed changes
@wzheng1
Copy link

wzheng1 commented Sep 30, 2020

@bobfuru As for "object storage" , maybe we can leave it there, since we found Openshift Container Storage can be used as an object storage. But Openshift QE is not responsible for this part of testing, we cannot ack this for sure.

@bobfuru bobfuru mentioned this pull request Sep 30, 2020
Merged
@bobfuru
Copy link
Contributor Author

bobfuru commented Sep 30, 2020 •
edited
Loading

@bobfuru As for "object storage" , maybe we can leave it there, since we found Openshift Container Storage can be used as an object storage. But Openshift QE is not responsible for this part of testing, we cannot ack this for sure.

I agree that it's better to leave object storage out of this note, so I will. We do already mention OCS as an example in the prereqs anyway. But as a side note, OCS is storage-agnostic, "supporting file, block, and object storage, either in-house or in hybrid clouds" [1].

[1] https://docs.openshift.com/container-platform/4.5/storage/persistent_storage/persistent-storage-ocs.html

@bobfuru
Copy link
Contributor Author

bobfuru commented Sep 30, 2020

@wzheng1 Thanks for your feedback. I believe this is ready for a final ack from QE, please?

@wzheng1
Copy link

wzheng1 commented Oct 9, 2020

Acked by QE.

@bobfuru bobfuru added the peer-review-needed Signifies that the peer review team needs to review this PR label Oct 9, 2020
@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 9, 2020

@openshift/team-documentation PTAL

@codyhoag codyhoag self-requested a review October 9, 2020 14:17
codyhoag
codyhoag reviewed Oct 9, 2020
View reviewed changes
Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

Just a few nits; otherwise LGTM!

@codyhoag codyhoag 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 Oct 9, 2020
@bobfuru bobfuru removed the request for review from dmage October 9, 2020 21:10
@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 9, 2020

@huffmanca Do these changes look good to you?

@huffmanca
Copy link
Contributor

huffmanca commented Oct 15, 2020

Apologies for the delay.

These changes look good to me!

@bobfuru bobfuru merged commit 7bc847d into openshift:master Oct 15, 2020
@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 15, 2020 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 15, 2020 •
edited by openshift-ci-robot
Loading

@bobfuru: #25826 failed to apply on top of branch "enterprise-4.6":

Applying: BZ1850510 - remove NFS from image reg docs
Using index info to reconstruct a base tree...
M	installing/installing_bare_metal/installing-bare-metal.adoc
M	modules/registry-configuring-storage-baremetal.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/registry-configuring-storage-baremetal.adoc
CONFLICT (content): Merge conflict in modules/registry-configuring-storage-baremetal.adoc
Auto-merging installing/installing_bare_metal/installing-bare-metal.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BZ1850510 - remove NFS from image reg docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick enterprise-4.6

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.

@bobfuru bobfuru mentioned this pull request Oct 15, 2020
Merged
@bobfuru bobfuru deleted the BZ1850510-update branch October 15, 2020 19:46
@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 15, 2020

Opened #26512 to CP to 4.6, which caused merge conflict due to IBM Z edits. Cc: @vikram-redhat and @ktania

@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 23, 2020 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.5

@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 23, 2020 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.4

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 23, 2020
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 23, 2020 •
edited by openshift-ci-robot
Loading

@bobfuru: new pull request created: #26694

Details

In response to this:

/cherrypick enterprise-4.5

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.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 23, 2020 •
edited by openshift-ci-robot
Loading

@bobfuru: #25826 failed to apply on top of branch "enterprise-4.4":

Applying: BZ1850510 - remove NFS from image reg docs
Using index info to reconstruct a base tree...
M	installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
M	installing/installing_bare_metal/installing-bare-metal.adoc
M	installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
M	modules/registry-configuring-storage-baremetal.adoc
M	modules/registry-configuring-storage-vsphere.adoc
M	registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc
Auto-merging modules/registry-configuring-storage-vsphere.adoc
CONFLICT (content): Merge conflict in modules/registry-configuring-storage-vsphere.adoc
Auto-merging modules/registry-configuring-storage-baremetal.adoc
CONFLICT (content): Merge conflict in modules/registry-configuring-storage-baremetal.adoc
Auto-merging installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_bare_metal/installing-bare-metal.adoc
Auto-merging installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 BZ1850510 - remove NFS from image reg docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick enterprise-4.4

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.

@bobfuru bobfuru mentioned this pull request Oct 23, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@huffmanca huffmanca Awaiting requested review from huffmanca

3 more reviewers

@codyhoag codyhoag codyhoag left review comments

@wzheng1 wzheng1 wzheng1 left review comments

@qinpingli qinpingli qinpingli left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

8 participants

@bobfuru @openshift-docs-preview-bot @wzheng1 @huffmanca @openshift-cherrypick-robot @codyhoag @qinpingli @openshift-ci-robot