SM 1.1 update #20765

neal-timpe · 2020-03-30T20:47:30Z

This is a SM 1.1 update PR, which should be cherrypicked to the 4.3 and 4.4. branch.

It will include
OSSMDOC-50
OSSMDOC-51
OSSMDOC-52
OSSMDOC-53
OSSMDOC-17

openshift-docs-preview-bot · 2020-03-30T20:49:52Z

The preview will be available shortly at:

https://sm11update--ocpdocs.netlify.com/

modules/ossm-document-attributes.adoc

service_mesh/service_mesh_install/updating-ossm.adoc

neal-timpe · 2020-04-02T22:07:45Z

@dgn I've added https://issues.redhat.com/browse/OSSMDOC-51 in prepare-to-deploy-applications-ossm.adoc

neal-timpe · 2020-04-02T22:10:05Z

@gbaufake https://sm11update--ocpdocs.netlify.com/openshift-enterprise/latest/service_mesh/service_mesh_install/removing-ossm.html

I've added a line to this file for https://issues.redhat.com/browse/OSSMDOC-53

neal-timpe · 2020-04-02T22:16:36Z

@luksa Can you take a look at this PR. I added maistra/maistra.github.io#112 to the OSSM docs.

modules/ossm-member-roll-create.adoc

service_mesh/service_mesh_install/updating-ossm.adoc

service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc

modules/ossm-about-collecting-ossm-data.adoc

modules/ossm-rn-new-features.adoc

service_mesh/service_mesh_install/updating-ossm.adoc

neal-timpe · 2020-04-06T16:37:30Z

@yxun If you'd like to take a look at this PR, or add input for release notes, I'd appreciate it. I can't add you as a reviewer. Thanks!

JStickler

Couple of questions and small changes.

modules/ossm-about-collecting-ossm-data.adoc

modules/ossm-member-roll-create.adoc

service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc

modules/ossm-rn-new-features.adoc

tvieira

LGTM

yxun

@knrc @neal-timpe @rcernich @tvieira Could we add a known issue in modules/ossm-rn-known-issues.adoc ?

https://bugzilla.redhat.com/show_bug.cgi?id=1821432

All UI Toggle controls in a Service Mesh Control Plane (SMCP) Overview page are not supported. User should update a SMCP from editing the Yaml content instead of clicking the Toggle contorls.

yxun

Could we add a known issue in modules/ossm-rn-known-issues.adoc ?

https://bugzilla.redhat.com/show_bug.cgi?id=1821432

All UI Toggle controls in a Service Mesh Control Plane (SMCP) Overview page are not supported. User should update a SMCP from editing the Yaml content instead of clicking the Toggle contorls.

rcernich · 2020-04-07T15:36:22Z

While that bug is an issue, it is a bug in the console, which may get back ported into older releases, which means our known issue will get fixed outside the scope of one of our releases.

JStickler

Just a couple more small tweaks.

modules/ossm-member-roll-create.adoc

yxun

Thank, @neal-timpe . Approved.

neal-timpe · 2020-04-08T21:50:39Z

/cherry-pick enterprise-4.3

neal-timpe · 2020-04-08T21:50:44Z

/cherry-pick enterprise-4.4

openshift-cherrypick-robot · 2020-04-08T21:50:49Z

@neal-timpe: #20765 failed to apply on top of branch "enterprise-4.4":

.git/rebase-apply/patch:50: trailing whitespace.
To collect {ProductName} data with `must-gather`, you must specify the {ProductName} image: 
.git/rebase-apply/patch:108: trailing whitespace.
`ServiceMeshMember` resources can be created by service mesh users who don't have privileges to add members to the `ServiceMeshMemberRoll` directly. While project administrators are automatically given permission to create the `ServiceMeshMember` resource in their project, they cannot point it to any `ServiceMeshControlPlane` until the service mesh administrator explicitly grants access to the service mesh. Administrators can grant users permissions to access the mesh by granting them the `mesh-user` user role, for example: 
.git/rebase-apply/patch:114: trailing whitespace.
Administrators can modify the `mesh user` role binding in the control plane project to specify the users and groups that are granted access. The `ServiceMeshMember` adds the project to the `ServiceMeshMemberRoll` within the control plane project it references. 
.git/rebase-apply/patch:185: trailing whitespace.
* link:https://bugzilla.redhat.com/show_bug.cgi?id=1821432[Bug 1821432] Toggle controls in {product-title} Control Resource details page do not update the CR correctly. UI Toggle controls in the Service Mesh Control Plane (SMCP) Overview page in the {product-title} web console sometimes update the wrong field in the resource. To update a SMCP, edit the YAML content directly or update the resource from the command line instead of clicking the toggle controls. 
.git/rebase-apply/patch:279: trailing whitespace.
If you're updating from {ProductName} 1.0 to 1.1, you must update the `ServiceMeshControlPlane` resource to update the control plane components to the new version. 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/ossm-tutorial-bookinfo-install.adoc
M	service_mesh/service_mesh_install/updating-ossm.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/service_mesh_install/updating-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/service_mesh_install/updating-ossm.adoc
Auto-merging modules/ossm-tutorial-bookinfo-install.adoc
Auto-merging _topic_map.yml
Patch failed at 0001 changed 1.0 to stable

In response to this:

/cherry-pick 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.

openshift-cherrypick-robot · 2020-04-08T21:50:49Z

@neal-timpe: new pull request created: #21040

In response to this:

/cherry-pick enterprise-4.3

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.

neal-timpe · 2020-04-08T21:53:21Z

/cherry-pick enterprise-4.4

openshift-cherrypick-robot · 2020-04-08T21:53:25Z

@neal-timpe: #20765 failed to apply on top of branch "enterprise-4.4":

.git/rebase-apply/patch:50: trailing whitespace.
To collect {ProductName} data with `must-gather`, you must specify the {ProductName} image: 
.git/rebase-apply/patch:108: trailing whitespace.
`ServiceMeshMember` resources can be created by service mesh users who don't have privileges to add members to the `ServiceMeshMemberRoll` directly. While project administrators are automatically given permission to create the `ServiceMeshMember` resource in their project, they cannot point it to any `ServiceMeshControlPlane` until the service mesh administrator explicitly grants access to the service mesh. Administrators can grant users permissions to access the mesh by granting them the `mesh-user` user role, for example: 
.git/rebase-apply/patch:114: trailing whitespace.
Administrators can modify the `mesh user` role binding in the control plane project to specify the users and groups that are granted access. The `ServiceMeshMember` adds the project to the `ServiceMeshMemberRoll` within the control plane project it references. 
.git/rebase-apply/patch:185: trailing whitespace.
* link:https://bugzilla.redhat.com/show_bug.cgi?id=1821432[Bug 1821432] Toggle controls in {product-title} Control Resource details page do not update the CR correctly. UI Toggle controls in the Service Mesh Control Plane (SMCP) Overview page in the {product-title} web console sometimes update the wrong field in the resource. To update a SMCP, edit the YAML content directly or update the resource from the command line instead of clicking the toggle controls. 
.git/rebase-apply/patch:279: trailing whitespace.
If you're updating from {ProductName} 1.0 to 1.1, you must update the `ServiceMeshControlPlane` resource to update the control plane components to the new version. 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/ossm-tutorial-bookinfo-install.adoc
M	service_mesh/service_mesh_install/updating-ossm.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/service_mesh_install/updating-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/service_mesh_install/updating-ossm.adoc
Auto-merging modules/ossm-tutorial-bookinfo-install.adoc
Auto-merging _topic_map.yml
Patch failed at 0001 changed 1.0 to stable

In response to this:

/cherry-pick 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.

openshift-cherrypick-robot · 2020-04-08T23:57:47Z

@neal-timpe: new pull request could not be created: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:enterprise-4.3 and openshift-cherrypick-robot:cherry-pick-20765-to-enterprise-4.3"}],"documentation_url":"https://developer.github.com/v3/pulls/#create-a-pull-request"}

In response to this:

/cherry-pick enterprise-4.3

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 · 2020-04-08T23:57:49Z

@neal-timpe: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift-cherrypick-robot/openshift-docs\n ! [remote rejected] cherry-pick-20765-to-enterprise-4.3 -> cherry-pick-20765-to-enterprise-4.3 (cannot lock ref 'refs/heads/cherry-pick-20765-to-enterprise-4.3': is at c3fe5b9 but expected fe486a5)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:CENSORED@github.com/openshift-cherrypick-robot/openshift-docs'\n", error: exit status 1

In response to this:

/cherry-pick enterprise-4.3

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 · 2020-04-08T23:57:51Z

@neal-timpe: #20765 failed to apply on top of branch "enterprise-4.4":

.git/rebase-apply/patch:50: trailing whitespace.
To collect {ProductName} data with `must-gather`, you must specify the {ProductName} image: 
.git/rebase-apply/patch:108: trailing whitespace.
`ServiceMeshMember` resources can be created by service mesh users who don't have privileges to add members to the `ServiceMeshMemberRoll` directly. While project administrators are automatically given permission to create the `ServiceMeshMember` resource in their project, they cannot point it to any `ServiceMeshControlPlane` until the service mesh administrator explicitly grants access to the service mesh. Administrators can grant users permissions to access the mesh by granting them the `mesh-user` user role, for example: 
.git/rebase-apply/patch:114: trailing whitespace.
Administrators can modify the `mesh user` role binding in the control plane project to specify the users and groups that are granted access. The `ServiceMeshMember` adds the project to the `ServiceMeshMemberRoll` within the control plane project it references. 
.git/rebase-apply/patch:185: trailing whitespace.
* link:https://bugzilla.redhat.com/show_bug.cgi?id=1821432[Bug 1821432] Toggle controls in {product-title} Control Resource details page do not update the CR correctly. UI Toggle controls in the Service Mesh Control Plane (SMCP) Overview page in the {product-title} web console sometimes update the wrong field in the resource. To update a SMCP, edit the YAML content directly or update the resource from the command line instead of clicking the toggle controls. 
.git/rebase-apply/patch:279: trailing whitespace.
If you're updating from {ProductName} 1.0 to 1.1, you must update the `ServiceMeshControlPlane` resource to update the control plane components to the new version. 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/ossm-control-plane-deploy.adoc
M	modules/ossm-tutorial-bookinfo-install.adoc
M	service_mesh/service_mesh_install/updating-ossm.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/service_mesh_install/updating-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/service_mesh_install/updating-ossm.adoc
Auto-merging modules/ossm-tutorial-bookinfo-install.adoc
Auto-merging modules/ossm-control-plane-deploy.adoc
Auto-merging _topic_map.yml
Patch failed at 0001 changed 1.0 to stable

In response to this:

/cherry-pick 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.

openshift-cherrypick-robot · 2020-04-08T23:57:54Z

@neal-timpe: #20765 failed to apply on top of branch "enterprise-4.4":

.git/rebase-apply/patch:50: trailing whitespace.
To collect {ProductName} data with `must-gather`, you must specify the {ProductName} image: 
.git/rebase-apply/patch:108: trailing whitespace.
`ServiceMeshMember` resources can be created by service mesh users who don't have privileges to add members to the `ServiceMeshMemberRoll` directly. While project administrators are automatically given permission to create the `ServiceMeshMember` resource in their project, they cannot point it to any `ServiceMeshControlPlane` until the service mesh administrator explicitly grants access to the service mesh. Administrators can grant users permissions to access the mesh by granting them the `mesh-user` user role, for example: 
.git/rebase-apply/patch:114: trailing whitespace.
Administrators can modify the `mesh user` role binding in the control plane project to specify the users and groups that are granted access. The `ServiceMeshMember` adds the project to the `ServiceMeshMemberRoll` within the control plane project it references. 
.git/rebase-apply/patch:185: trailing whitespace.
* link:https://bugzilla.redhat.com/show_bug.cgi?id=1821432[Bug 1821432] Toggle controls in {product-title} Control Resource details page do not update the CR correctly. UI Toggle controls in the Service Mesh Control Plane (SMCP) Overview page in the {product-title} web console sometimes update the wrong field in the resource. To update a SMCP, edit the YAML content directly or update the resource from the command line instead of clicking the toggle controls. 
.git/rebase-apply/patch:279: trailing whitespace.
If you're updating from {ProductName} 1.0 to 1.1, you must update the `ServiceMeshControlPlane` resource to update the control plane components to the new version. 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/ossm-control-plane-deploy.adoc
M	modules/ossm-tutorial-bookinfo-install.adoc
M	service_mesh/service_mesh_install/updating-ossm.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/service_mesh_install/updating-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/service_mesh_install/updating-ossm.adoc
Auto-merging modules/ossm-tutorial-bookinfo-install.adoc
Auto-merging modules/ossm-control-plane-deploy.adoc
Auto-merging _topic_map.yml
Patch failed at 0001 changed 1.0 to stable

In response to this:

/cherry-pick 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.

neal-timpe changed the title ~~changed 1.0 to stable~~ SM 1.1 update Mar 30, 2020

rcernich reviewed Apr 2, 2020

View reviewed changes

modules/ossm-document-attributes.adoc Outdated Show resolved Hide resolved

rcernich reviewed Apr 2, 2020

View reviewed changes

service_mesh/service_mesh_install/updating-ossm.adoc Outdated Show resolved Hide resolved

neal-timpe requested a review from gbaufake April 2, 2020 22:10

gbaufake approved these changes Apr 2, 2020

View reviewed changes

luksa reviewed Apr 3, 2020

View reviewed changes

dgn reviewed Apr 3, 2020

View reviewed changes

service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc Outdated Show resolved Hide resolved

neal-timpe self-assigned this Apr 3, 2020

brian-avery reviewed Apr 3, 2020

View reviewed changes

modules/ossm-about-collecting-ossm-data.adoc Outdated Show resolved Hide resolved

rcernich reviewed Apr 3, 2020

View reviewed changes

modules/ossm-rn-new-features.adoc Outdated Show resolved Hide resolved

rcernich reviewed Apr 3, 2020

View reviewed changes

modules/ossm-rn-new-features.adoc Outdated Show resolved Hide resolved

neal-timpe requested review from JStickler, brian-avery and rcernich April 3, 2020 18:21

brian-avery reviewed Apr 3, 2020

View reviewed changes

service_mesh/service_mesh_install/updating-ossm.adoc Outdated Show resolved Hide resolved

brian-avery approved these changes Apr 3, 2020

View reviewed changes

neal-timpe requested review from knrc and tvieira April 6, 2020 14:32

JStickler suggested changes Apr 6, 2020

View reviewed changes

neal-timpe requested a review from JStickler April 6, 2020 19:36

yxun reviewed Apr 6, 2020

View reviewed changes

modules/ossm-rn-new-features.adoc Outdated Show resolved Hide resolved

yxun approved these changes Apr 6, 2020

View reviewed changes

brian-avery reviewed Apr 6, 2020

View reviewed changes

modules/ossm-rn-new-features.adoc Outdated Show resolved Hide resolved

tvieira approved these changes Apr 6, 2020

View reviewed changes

yxun reviewed Apr 7, 2020

View reviewed changes

yxun suggested changes Apr 7, 2020

View reviewed changes

JStickler suggested changes Apr 7, 2020

View reviewed changes

modules/ossm-member-roll-create.adoc Outdated Show resolved Hide resolved

modules/ossm-member-roll-create.adoc Outdated Show resolved Hide resolved

modules/ossm-member-roll-create.adoc Outdated Show resolved Hide resolved

yxun approved these changes Apr 7, 2020

View reviewed changes

JStickler approved these changes Apr 7, 2020

View reviewed changes

changed 1.0 to stable

d0bf24d

neal-timpe force-pushed the sm11update branch from 3f612ea to d0bf24d Compare April 7, 2020 19:53

neal-timpe mentioned this pull request Apr 8, 2020

1.1 updates for 4.2 #21004

Merged

neal-timpe merged commit fda7294 into openshift:master Apr 8, 2020

openshift-cherrypick-robot mentioned this pull request Apr 8, 2020

[enterprise-4.3] SM 1.1 update #21040

Merged

vikram-redhat added branch/enterprise-4.3 branch/enterprise-4.4 labels Apr 8, 2020

vikram-redhat added this to the Next Release milestone Apr 8, 2020

neal-timpe deleted the sm11update branch April 15, 2020 13:56

This was referenced Apr 22, 2020

Sm11update44 #21401

Closed

sm11 updates for 44 branch #21489

Merged

SM 1.1 update #20765

SM 1.1 update #20765

Uh oh!

Conversation

neal-timpe commented Mar 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-docs-preview-bot commented Mar 30, 2020

Uh oh!

Uh oh!

Uh oh!

neal-timpe commented Apr 2, 2020

Uh oh!

neal-timpe commented Apr 2, 2020

Uh oh!

neal-timpe commented Apr 2, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

neal-timpe commented Apr 6, 2020

Uh oh!

JStickler left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tvieira left a comment

Choose a reason for hiding this comment

Uh oh!

yxun left a comment

Choose a reason for hiding this comment

Uh oh!

yxun left a comment

Choose a reason for hiding this comment

Uh oh!

rcernich commented Apr 7, 2020

Uh oh!

JStickler left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yxun left a comment

Choose a reason for hiding this comment

Uh oh!

neal-timpe commented Apr 8, 2020

Uh oh!

neal-timpe commented Apr 8, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 8, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 8, 2020

Uh oh!

neal-timpe commented Apr 8, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 8, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 8, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 8, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 8, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 8, 2020

neal-timpe commented Mar 30, 2020 •

edited

Loading