Skip to content

Conversation

@skopacz1
Copy link
Contributor

@skopacz1 skopacz1 commented Mar 22, 2023

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 22, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 22, 2023

@skopacz1: This pull request references OSDOCS-5567 which is a valid jira issue.

Details

In response to this:

OSDOCS-5567

Versions: 4.9+

This PR replaces an admonition that was accidentally removed in #55448

QE review:

  • QE has approved this change.

Preview:

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.

1 similar comment
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 22, 2023

@skopacz1: This pull request references OSDOCS-5567 which is a valid jira issue.

Details

In response to this:

OSDOCS-5567

Versions: 4.9+

This PR replaces an admonition that was accidentally removed in #55448

QE review:

  • QE has approved this change.

Preview:

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-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 22, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Mar 22, 2023

🤖 Tue Oct 08 13:41:27 - Prow CI generated the docs preview:

https://57578--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/nodes/virt-node-maintenance.html

@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 22, 2023

@skopacz1: This pull request references OSDOCS-5567 which is a valid jira issue.

Details

In response to this:

OSDOCS-5567

Versions: 4.9+

This PR replaces an admonition that was accidentally removed in #55448

QE review:

  • QE has approved this change.

Preview: https://57578--docspreview.netlify.app/openshift-enterprise/latest/updating/updating-restricted-network-cluster/mirroring-image-repository.html#update-mirror-repository-adm-release-mirror_mirroring-ocp-image-repository

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.


[IMPORTANT]
====
To avoid excessive memory usage by the OpenShift Update Service application, you must mirror release images to a separate repository as described in the following procedure.
Copy link
Member

Choose a reason for hiding this comment

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

We also want to bring back this command (also visible here, since linking to code in a file a pull request deletes seems unreliable) to accomplish that, when re-hydrating oc adm release mirror ... content on the mirrored registry. #33841 has the original implementation of this behavior and a commit message with more context, in case that's helpful.

Choose a reason for hiding this comment

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

Mirroring to a separate repository is mandatory for OSUS only while the section works for both upgrading with OSUS and without OSUS. So I'd suggest we add a step in the end of the section, for example

[IMPORTANT]
====
If you want to update your cluster using the OpenShift Update Service application, you must mirror release images to a separate repository as described in the following procedure. Otherwise, you can skip the step
====
5. Mirror release images to a separate repository
$ oc image mirror -a ${LOCAL_SECRET_JSON} ${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE}-${ARCHITECTURE} ${LOCAL_REGISTRY}/${LOCAL_RELEASE_IMAGES_REPOSITORY}:${OCP_RELEASE}-${ARCHITECTURE}

Copy link
Contributor Author

@skopacz1 skopacz1 Mar 24, 2023

Choose a reason for hiding this comment

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

@wking and @shellyyang1989 how about if I begin both of these added steps with a statement that it's only applicable to OSUS users?

for example: vi. If you are using the OpenShift Update Service, mirror release images to a separate repository

I think this aligns with how we're supposed to write conditional steps per the style guide (that is, forming the instruction like "if you , do this step")

It can also be phrased like "OSUS users only: do this step"

Copy link

@shellyyang1989 shellyyang1989 Mar 27, 2023

Choose a reason for hiding this comment

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

If you meant adding the statement to below steps, it's fine with me.

.. Export an additional local repository name to contain the release images:
+
[source,terminal]
----
$ LOCAL_RELEASE_IMAGES_REPOSITORY='<local_release_images_repository_name>'
----
+
For `<local_release_images_repository_name>`, specify the name of the repository to
create in your registry, such as `ocp4/openshift4-release-images`.

and

... Mirror the release image to a separate repository:
+
[source,terminal]
----
$ oc image mirror -a ${LOCAL_SECRET_JSON} ${LOCAL_REGISTRY}/${LOCAL_REPOSITORY}:${OCP_RELEASE}-${ARCHITECTURE} ${LOCAL_REGISTRY}/${LOCAL_RELEASE_IMAGES_REPOSITORY}:${OCP_RELEASE}-${ARCHITECTURE}

But we still need to append the step Mirror the release image to a separate repository to the last step If the local container registry and the cluster are connected to the mirror host, directly push the release images to the local registry and apply the config map to the cluster by using following command: because it is mirroring the manifests and release images to the same repository.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@shellyyang1989 Okay thank you for clarifying, I understand what you mean. Sorry for any confusion!

Could you take a look at the procedure again to see if I made the changes you were imagining for that final step you mentioned?

@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 23, 2023
@skopacz1
Copy link
Contributor Author

@shellyyang1989 PTAL, thank you

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 27, 2023
@shellyyang1989
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 28, 2023

@skopacz1: This pull request references OSDOCS-5567 which is a valid jira issue.

Details

In response to this:

OSDOCS-5567

Versions: 4.9+

This PR replaces an admonition that was accidentally removed in #55448

QE review:

  • QE has approved this change.

Preview: https://57578--docspreview.netlify.app/openshift-enterprise/latest/updating/updating-restricted-network-cluster/mirroring-image-repository.html#update-mirror-repository-adm-release-mirror_mirroring-ocp-image-repository

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.

@skopacz1
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 28, 2023
@tmalove
Copy link
Contributor

tmalove commented Mar 28, 2023

/remove-label peer-review-needed
/label peer-review-in-progress

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 28, 2023
@tmalove
Copy link
Contributor

tmalove commented Mar 28, 2023

/remove-label peer-review-in-progress
/label peer-review-done
/LGTM

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Mar 28, 2023
@skopacz1
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 28, 2023
@mburke5678 mburke5678 added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Mar 28, 2023
@mburke5678 mburke5678 merged commit 2420457 into openshift:main Mar 28, 2023
@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.9

@openshift-cherrypick-robot

@mburke5678: new pull request created: #57879

Details

In response to this:

/cherrypick enterprise-4.9

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.

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.10

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.11

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.12

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@mburke5678: new pull request created: #57880

Details

In response to this:

/cherrypick enterprise-4.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.

@openshift-cherrypick-robot

@mburke5678: new pull request created: #57881

Details

In response to this:

/cherrypick enterprise-4.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.

@openshift-cherrypick-robot

@mburke5678: new pull request created: #57882

Details

In response to this:

/cherrypick enterprise-4.12

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

@mburke5678: new pull request created: #57883

Details

In response to this:

/cherrypick enterprise-4.13

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.

@skopacz1 skopacz1 deleted the OSDOCS-5567 branch October 31, 2023 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants