Skip to content

osdocs-2368: updating 4.8 references to 4.9#36974

Merged
jeana-redhat merged 1 commit intoopenshift:mainfrom
kalexand-rh:osdocs2368
Oct 15, 2021
Merged

osdocs-2368: updating 4.8 references to 4.9#36974
jeana-redhat merged 1 commit intoopenshift:mainfrom
kalexand-rh:osdocs2368

Conversation

@kalexand-rh
Copy link
Contributor

@kalexand-rh kalexand-rh commented Oct 1, 2021

https://issues.redhat.com/browse/OSDOCS-2368

Fixes #36318

4.9

These changes are pervasive, but here's a sample link.

@kalexand-rh kalexand-rh added this to the Future Release milestone Oct 1, 2021
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 1, 2021
@netlify
Copy link

netlify bot commented Oct 1, 2021

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rolfedh, PTAL at my guess at the logging updates?

Copy link
Contributor

Choose a reason for hiding this comment

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

@anpingli Would you review and approve this change for OpenShift 4.9 GA?

Copy link

Choose a reason for hiding this comment

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

Logging 5.2 support OCP 4.7,4.8, 4.9.
We only support 5.2 on OCP 4.9

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
{product-title} 4.7, 4.8, and 4.9 support OpenShift Logging 5.0, 5.1, and 5.2.
.{product-title} version support for Red Hat OpenShift Logging (RHOL)
[frame="topbot",options="header"]
|====
| |4.7 |4.8 |4.9
|RHOL 5.0|yes |yes |
|RHOL 5.1|yes |yes |
|RHOL 5.2|yes |yes |yes
|====

Copy link
Contributor

Choose a reason for hiding this comment

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

Approved. FYI @libander @anpingli

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@JStickler, should this be updated before OCP 4.9 GA?

Copy link
Contributor

Choose a reason for hiding this comment

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

@JStickler is out, so trying @rh-tokeefe

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rh-tokeefe, any thoughts on this one?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @kalexand-rh my understanding is that we wanted to specifically communicate that to customers. That change was made to follow/mirror a change made in OCP 4.8.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rh-tokeefe, this change is going to make less sense in the 4.9 version of the docs, but I'm happy to leave it for you to follow up on separately.

Copy link
Member

@ousleyp ousleyp left a comment

Choose a reason for hiding this comment

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

I responded on each file; thanks! :)

@kalexand-rh kalexand-rh force-pushed the osdocs2368 branch 2 times, most recently from ec191c2 to 3cf547f Compare October 4, 2021 12:38
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2021
Copy link
Contributor

Choose a reason for hiding this comment

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

@anpingli Would you review and approve this change for OpenShift 4.9 GA?

Copy link

Choose a reason for hiding this comment

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

@rolfedh Only Logging 5.2 support 4.9. Please remove 5.0,5.1 here.

Copy link
Contributor

@rolfedh rolfedh Oct 8, 2021

Choose a reason for hiding this comment

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

Suggested change
OpenShift Logging 5.0, 5.1, and 5.2 run on {product-title} 4.7, 4.8, and 4.9.
.{product-title} version support for Red Hat OpenShift Logging (RHOL)
[frame="topbot",options="header"]
|====
| |4.7 |4.8 |4.9
|RHOL 5.0|yes |yes |
|RHOL 5.1|yes |yes |
|RHOL 5.2|yes |yes |yes
|====

Copy link
Contributor

Choose a reason for hiding this comment

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

Approved. FYI @libander @anpingli

@openshift-ci
Copy link

openshift-ci bot commented Oct 4, 2021

New changes are detected. LGTM label has been removed.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2021
@anpingli
Copy link

lgtm on Logging

@kalexand-rh kalexand-rh force-pushed the osdocs2368 branch 3 times, most recently from e1b5181 to f7e38da Compare October 13, 2021 14:26
@kalexand-rh
Copy link
Contributor Author

@jiajliu, I think I've addressed all of your upgrade concerns. Thank you. Will you PTAL again? (They're all on f7e38da)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@zhaozhanqi, will you please confirm that this update is acceptable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@zhaozhanqi, will you please confirm that this update for 4.9 is acceptable? I need to merge this tomorrow, and I'd much rather do it with your approval!

Choose a reason for hiding this comment

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

@kalexand-rh seems the date is old for 4.9. we have not 4.9 version in 2020 :) Could you update it with
sriov-network-operator.4.9.0-202110121402

Choose a reason for hiding this comment

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

other lgtm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you so much! (I knew that looked wrong in a way that using a made-up hash doesn't, so thank you for clarifying it!)

@jiajliu
Copy link

jiajliu commented Oct 14, 2021

@jiajliu, I think I've addressed all of your upgrade concerns. Thank you. Will you PTAL again? (They're all on f7e38da)

@kalexand-rh lgtm

@vikram-redhat
Copy link
Contributor

vikram-redhat commented Oct 14, 2021

@wsun1 Hi. Do you know if all teams have reviewed this PR?

Copy link
Member

Choose a reason for hiding this comment

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

@kalexand-rh metering will not be shipped for 4.9, so I think all metering references should be removed in this upgrade doc https://issues.redhat.com/browse/CLOUDDST-8973

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@vikram-redhat, do we have a plan for removing the metering content?

Copy link
Contributor

Choose a reason for hiding this comment

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

It has been removed: #36779. I guess we should delete the modules/assemblies as well?

@wsun1
Copy link

wsun1 commented Oct 14, 2021

@wsun1 Hi. Do you know if all teams have reviewed this PR?

@vikram-redhat We reviewed the PR, some docs need KNI and OCS QE to review, I sent one email to ask them to help review. Thanks!

Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

merge approval 👍

@jeana-redhat jeana-redhat merged commit 16a5c0b into openshift:main Oct 15, 2021
@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.9

@openshift-cherrypick-robot

@jeana-redhat: #36974 failed to apply on top of branch "enterprise-4.9":

Applying: osdocs-2368: updating 4.8 references to 4.9
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/common-attributes.adoc
M	modules/gathering-data-specific-features.adoc
M	modules/nodes-nodes-viewing-listing.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
Auto-merging modules/nodes-nodes-viewing-listing.adoc
Auto-merging modules/gathering-data-specific-features.adoc
CONFLICT (content): Merge conflict in modules/gathering-data-specific-features.adoc
Auto-merging modules/common-attributes.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 osdocs-2368: updating 4.8 references to 4.9
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.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.

wking added a commit to wking/openshift-docs that referenced this pull request Nov 17, 2021
In 4.1, the installer used to explicitly set upstream to our default
URI.  But in openshift/installer#c9095b34518a0
(data/manifests/bootkube/cvo-overrides: Drop the explicit update,
2020-08-28, openshift/installer#4112), which landed in 4.7 and was not
backported, I'd stopped doing that.  In clusters born in 4.7 and
later, the installer will leave upstream unset, and the
cluster-version operator will default to making a reasonable choice.

We still need to talk about explicit upstreams in the case where folks
are pointing their cluster at a local OpenShift Update Service, but
this commit drops the properties where we were incidentally pointing
at the default, Red-Hat-hosted location, because explicitly setting
that value is an anti-pattern that makes it harder for clusters to
adapt if we try to move our default location elsewhere in the future.

Also restore a closing brace and dangling comma to clean up after
c0fc03d (osdocs-2368: updating 4.8 references to 4.9, 2021-10-01, openshift#36974),
which also removed some of the stale 'upstream' references.
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Nov 17, 2021
In 4.1, the installer used to explicitly set upstream to our default
URI.  But in openshift/installer#c9095b34518a0
(data/manifests/bootkube/cvo-overrides: Drop the explicit update,
2020-08-28, openshift/installer#4112), which landed in 4.7 and was not
backported, I'd stopped doing that.  In clusters born in 4.7 and
later, the installer will leave upstream unset, and the
cluster-version operator will default to making a reasonable choice.

We still need to talk about explicit upstreams in the case where folks
are pointing their cluster at a local OpenShift Update Service, but
this commit drops the properties where we were incidentally pointing
at the default, Red-Hat-hosted location, because explicitly setting
that value is an anti-pattern that makes it harder for clusters to
adapt if we try to move our default location elsewhere in the future.

Also restore a closing brace and dangling comma to clean up after
c0fc03d (osdocs-2368: updating 4.8 references to 4.9, 2021-10-01, openshift#36974),
which also removed some of the stale 'upstream' references.
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Nov 17, 2021
In 4.1, the installer used to explicitly set upstream to our default
URI.  But in openshift/installer#c9095b34518a0
(data/manifests/bootkube/cvo-overrides: Drop the explicit update,
2020-08-28, openshift/installer#4112), which landed in 4.7 and was not
backported, I'd stopped doing that.  In clusters born in 4.7 and
later, the installer will leave upstream unset, and the
cluster-version operator will default to making a reasonable choice.

We still need to talk about explicit upstreams in the case where folks
are pointing their cluster at a local OpenShift Update Service, but
this commit drops the properties where we were incidentally pointing
at the default, Red-Hat-hosted location, because explicitly setting
that value is an anti-pattern that makes it harder for clusters to
adapt if we try to move our default location elsewhere in the future.

Also restore a closing brace and dangling comma to clean up after
c0fc03d (osdocs-2368: updating 4.8 references to 4.9, 2021-10-01, openshift#36974),
which also removed some of the stale 'upstream' references.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.9 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

Development

Successfully merging this pull request may close these issues.

Replace the version to latest 4.9 in sample content for PSAP