Skip to content

Conversation

neal-timpe
Copy link
Contributor

@neal-timpe neal-timpe commented Oct 12, 2020

This PR addresses the migration procedure from ossm11 to ossm20.

It'll be merged with #26265, which updates the SCMP and configuration documentation, and #26261, which updates the installation procedures.

https://issues.redhat.com/browse/OSSMDOC-107

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 12, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@openshift-ci-robot openshift-ci-robot 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 Oct 14, 2020
@neal-timpe
Copy link
Contributor Author

@gbaufake @yxun this is still in progress. I'm still working through the content rob provided. But could you start to review this PR for the migration content? Is there a testing plan for the migration?

Copy link
Contributor

@JStickler JStickler left a comment

Choose a reason for hiding this comment

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

Couple of questions and a couple of small formatting issues.

@neal-timpe neal-timpe added the service-mesh Label for all Service Mesh PRs label Oct 23, 2020
@neal-timpe neal-timpe changed the title Migrating ossm from 1.1 to 2.0 OSSMDOC-107 - Migrating ossm from 1.1 to 2.0 Oct 23, 2020
@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 28, 2020
@neal-timpe neal-timpe force-pushed the migrating1120 branch 2 times, most recently from dbccb64 to cf629e2 Compare October 28, 2020 22:31
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 2, 2020
Copy link

@gbaufake gbaufake left a comment

Choose a reason for hiding this comment

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

Reviewed last changes from a week ago.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 3, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 3, 2020
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 4, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 4, 2020
@neal-timpe neal-timpe requested a review from JStickler November 4, 2020 18:44
@JStickler JStickler merged commit abfa489 into openshift:master Nov 4, 2020
@JStickler
Copy link
Contributor

JStickler commented Nov 4, 2020

/cherry-pick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 4, 2020

@JStickler: new pull request created: #27064

In response to this:

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

@JStickler
Copy link
Contributor

JStickler commented Nov 4, 2020

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 4, 2020

@JStickler: #26354 failed to apply on top of branch "enterprise-4.7":

Applying: migrating ossm
.git/rebase-apply/patch:39: trailing whitespace.
You can configure Pilot to schedule or set limits on resource allocation. 
.git/rebase-apply/patch:319: trailing whitespace.
          rootCADir:  /etc/cacerts 
.git/rebase-apply/patch:783: trailing whitespace.
The `ServiceMeshControlPlane` resource has been updated for {ProductName} version 2.0. After you created a v2 version of the `ServiceMeshControlPlane` resource, modify it to take advantage of the new features and to fit your deployment. Consider the following changes to the specification and behavior of {ProductName} 2.0 as you're modifying your `ServiceMeshControlPlane` resource. You can also refer to the {ProductName} 2.0 product documentation for updates to features you use. The v2 resource must be used for {ProductName} 2.0 installations. 
.git/rebase-apply/patch:830: trailing whitespace.
* `spec.origins[x].jwt.triggerRules` specified in the Policy must be mapped into one or more `security.istio.io/v1beta1` AuthorizationPolicy resources. Any `spec.selector.labels` must be configured similarly to the same field on RequestAuthentication.  
.git/rebase-apply/patch:858: trailing whitespace.
Mixer components are disabled by default in version 2.0. If you rely on Mixer plugins for your workload, you must configure your version 2.0 `ServiceMeshControlPlane` to include the Mixer components. 
warning: squelched 26 whitespace errors
warning: 31 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/ossm-security-mtls.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ossm-security-mtls.adoc
CONFLICT (content): Merge conflict in modules/ossm-security-mtls.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 migrating ossm
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:

/cherry-pick enterprise-4.7

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.

JStickler pushed a commit that referenced this pull request Nov 4, 2020
JStickler added a commit that referenced this pull request Nov 4, 2020
@neal-timpe neal-timpe deleted the migrating1120 branch November 20, 2020 15:43
@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
service-mesh Label for all Service Mesh PRs size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.