Skip to content
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

OSSM-6170 OSSM 2.5.1, 2.4.7, and 2.3.11 [DOC] Release Notes, Known Issues and Bug Fixes #73889

Merged
merged 1 commit into from Apr 22, 2024
Merged

OSSM-6170 OSSM 2.5.1, 2.4.7, and 2.3.11 [DOC] Release Notes, Known Issues and Bug Fixes #73889

merged 1 commit into from Apr 22, 2024

Conversation

gwynnemonahan
Copy link
Contributor

@gwynnemonahan gwynnemonahan commented Mar 28, 2024 •
edited

OSSM-6170 OSSM 2.5.1, 2.4.7, and 2.3.11 [DOC] Release Notes, Known Issues and Bug Fixes

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OSSM-6170

Link to docs preview:
2.5.1: https://73889--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes

2.4.7: https://73889--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#new-features-ossm-2-4-7

2.3.11: https://73889--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#new-features-ossm-2-3-11

Fixed Issues: https://73889--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#ossm-rn-fixed-issues_ossm-release-notes These specific issues:

[OSSM-6177]
[OSSM-6163]
[OSSM-6148]
[OSSM-6099]
[OSSM-5960]
[OSSM-5959]
[OSSM-5902]
[OSSM-5541]

Service Mesh Known Issues: https://73889--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#ossm-rn-known-issues-ossm_ossm-release-notes
Only this specific issue:

[OSSM-6267]

Kiali Known Issues: https://73889--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/servicemesh-release-notes#ossm-rn-known-issues-kiali_ossm-release-notes
Only these 3:

[OSSM-6299]
[OSSM-6298]
[OSSM-6290]

QE review:

  • QE has approved this change.

Additional information:
Some style changes, such as using attributes, have also been made, and VSCode seems to have found some extra spaces it decided to remove as well.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 28, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Mar 28, 2024 •
edited

🤖 Mon Apr 22 14:32:57 - Prow CI generated the docs preview:
https://73889--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2024
@gwynnemonahan gwynnemonahan force-pushed the OSSM-6170 branch 2 times, most recently from ef69601 to 6e6dede Compare April 1, 2024 15:30
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 1, 2024
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 1, 2024
@gwynnemonahan gwynnemonahan force-pushed the OSSM-6170 branch 2 times, most recently from ae6dfa6 to b60da41 Compare April 1, 2024 19:18
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 4, 2024
@gwynnemonahan gwynnemonahan force-pushed the OSSM-6170 branch 2 times, most recently from 8fe1d6b to 3c2d9b6 Compare April 9, 2024 12:08
@gwynnemonahan gwynnemonahan force-pushed the OSSM-6170 branch 4 times, most recently from 09bf7b8 to 9a5f8dd Compare April 10, 2024 13:10
@gwynnemonahan
Copy link
Contributor Author

/retest

@gwynnemonahan
Copy link
Contributor Author

/retest-required

@openshift-ci openshift-ci bot added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Apr 22, 2024
bergerhoffer
bergerhoffer reviewed Apr 22, 2024
View reviewed changes
Copy link
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

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

A typo that should be fixed before merging, and then questions on 4.15-specific issues that seem like they should only go into the 4.15 branch (and not 4.12-4.14)

modules/ossm-rn-known-issues.adoc Outdated Show resolved Hide resolved
modules/ossm-rn-known-issues.adoc Outdated Show resolved Hide resolved
modules/ossm-rn-known-issues.adoc Outdated Show resolved Hide resolved
@bergerhoffer bergerhoffer 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 Apr 22, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 22, 2024

@gwynnemonahan: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@bergerhoffer bergerhoffer added 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 Apr 22, 2024
bergerhoffer
bergerhoffer reviewed Apr 22, 2024
View reviewed changes
Copy link
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

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

LGTM now, merging!

@bergerhoffer bergerhoffer merged commit 17534e8 into openshift:main Apr 22, 2024
3 checks passed
@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.16

@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.15

@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.14

@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.13

@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@bergerhoffer: new pull request created: #74974

In response to this:

/cherrypick enterprise-4.16

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.

This was referenced Apr 22, 2024
Merged
Merged
@openshift-cherrypick-robot
Copy link

@bergerhoffer: new pull request created: #74975

In response to this:

/cherrypick enterprise-4.15

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

@bergerhoffer: new pull request created: #74976

In response to this:

/cherrypick enterprise-4.14

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.

This was referenced Apr 22, 2024
Merged
Merged
@openshift-cherrypick-robot
Copy link

@bergerhoffer: new pull request created: #74977

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.

@openshift-cherrypick-robot
Copy link

@bergerhoffer: #73889 failed to apply on top of branch "enterprise-4.12":

Applying: OSSM-6170 OSSM 2.5.1, 2.4.7, and 2.3.11 [DOC] Release Notes, Known Issues and Bug Fixes
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	modules/ossm-rn-deprecated-features.adoc
M	modules/ossm-rn-fixed-issues.adoc
M	modules/ossm-rn-known-issues.adoc
M	modules/ossm-rn-new-features.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ossm-rn-new-features.adoc
CONFLICT (content): Merge conflict in modules/ossm-rn-new-features.adoc
Auto-merging modules/ossm-rn-known-issues.adoc
CONFLICT (content): Merge conflict in modules/ossm-rn-known-issues.adoc
Auto-merging modules/ossm-rn-fixed-issues.adoc
CONFLICT (content): Merge conflict in modules/ossm-rn-fixed-issues.adoc
Auto-merging modules/ossm-rn-deprecated-features.adoc
CONFLICT (content): Merge conflict in modules/ossm-rn-deprecated-features.adoc
Auto-merging _attributes/common-attributes.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 OSSM-6170 OSSM 2.5.1, 2.4.7, and 2.3.11 [DOC] Release Notes, Known Issues and Bug Fixes
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".

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.

This was referenced Apr 22, 2024
Merged
Closed
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bergerhoffer bergerhoffer bergerhoffer left review comments

@maxwelldb maxwelldb maxwelldb left review comments

@bburt-rh bburt-rh bburt-rh left review comments

@ferhoyos ferhoyos ferhoyos left review comments

@ocpdocs-vale-bot ocpdocs-vale-bot ocpdocs-vale-bot left review comments

@yxun yxun yxun approved these changes

@pbajjuri20 pbajjuri20 pbajjuri20 approved these changes

Assignees
No one assigned
Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 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 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
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet