Skip to content

Resources migrated and excluded by MTC#29096

Merged
kalexand-rh merged 1 commit intoopenshift:masterfrom
RichardHoch:resources
Feb 10, 2021
Merged

Resources migrated and excluded by MTC#29096
kalexand-rh merged 1 commit intoopenshift:masterfrom
RichardHoch:resources

Conversation

@RichardHoch
Copy link
Copy Markdown
Contributor

@RichardHoch RichardHoch commented Feb 3, 2021

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 3, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Feb 3, 2021

Deploy preview for osdocs ready!

Built with commit 90b9c70

https://deploy-preview-29096--osdocs.netlify.app

@RichardHoch
Copy link
Copy Markdown
Contributor Author

@apinnick : please review. I debated a bit about where to place the discussion of the resources migrated by the MTC. It might also be included in the later section "Migrating your applications" (https://deploy-preview-29096--osdocs.netlify.app/openshift-enterprise/latest/migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.html and the parallel section in the other MTC documents). Let me know which location you prefer or suggest another.

Comment thread modules/migration-understanding-resources-mtc-migrates.adoc Outdated
Comment thread modules/migration-understanding-resources-mtc-migrates.adoc Outdated
Comment thread modules/migration-understanding-resources-mtc-migrates.adoc Outdated
Comment thread modules/migration-understanding-resources-mtc-migrates.adoc Outdated
Comment thread modules/migration-understanding-resources-mtc-migrates.adoc Outdated
Comment thread modules/migration-understanding-resources-mtc-migrates.adoc Outdated
Comment thread modules/migration-excluding-resources.adoc Outdated
Comment thread modules/migration-excluding-resources.adoc Outdated
Comment thread modules/migration-understanding-resources-mtc-migrates.adoc Outdated
@apinnick
Copy link
Copy Markdown
Contributor

apinnick commented Feb 3, 2021

@apinnick : please review. I debated a bit about where to place the discussion of the resources migrated by the MTC. It might also be included in the later section "Migrating your applications" (https://deploy-preview-29096--osdocs.netlify.app/openshift-enterprise/latest/migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.html and the parallel section in the other MTC documents). Let me know which location you prefer or suggest another.

Location is OK since this is conceptual material.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 7, 2021
@RichardHoch
Copy link
Copy Markdown
Contributor Author

@apinnick : am still waiting for information about "OLM migration" from the SME but I made the other changes you recommended. Perhaps we can delete the sentence about "OLM migration." I'm not sure what it actually adds.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 9, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 9, 2021
@RichardHoch RichardHoch marked this pull request as ready for review February 9, 2021 11:19
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 9, 2021
@RichardHoch
Copy link
Copy Markdown
Contributor Author

@apinnick : please review. Incorporates SME response to question about "OLM migration" and rebasing.

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 9, 2021
@kalexand-rh kalexand-rh added this to the Next Release milestone Feb 9, 2021
Copy link
Copy Markdown
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

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

I have some edits and suggestions.

Comment thread modules/migration-excluding-resources.adoc Outdated
Comment thread modules/migration-mtc-workflow.adoc Outdated
Comment thread modules/migration-mtc-workflow.adoc Outdated
Comment thread modules/migration-mtc-workflow.adoc Outdated
Comment thread modules/migration-prerequisites.adoc Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Update this command to be similar to the previous command.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I strongly suggest not using a specific package in the only version of the command that you present. It's more important that you're clear that the user needs to specify both the image name and version. You can add an example that uses python:3.3, if you want.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

"OCP" is not an approved shortname, and the only time it's acceptable to include it in the collection is in output or strings that we can't change.

You need to pull it from all you variables.

Suggested change
$ podman login -u $(oc whoami) -p $(oc whoami -t) --tls-verify=false <ocp3_host>
$ podman login -u $(oc whoami) -p $(oc whoami -t) --tls-verify=false <source_registry_host> <1>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In this, and all subsequent steps, you need to explain what <ocp3/4_host> is. And not use "ocp."

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

rhocp_host

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
$ oc get imagestream -n openshift | grep python
$ oc get imagestream -n openshift | grep <image_name>

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 9, 2021
@RichardHoch RichardHoch force-pushed the resources branch 3 times, most recently from b2eecdb to 3f3097f Compare February 10, 2021 09:18
@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 10, 2021
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 10, 2021
@kalexand-rh kalexand-rh added the peer-review-done Signifies that the peer review team has reviewed this PR label Feb 10, 2021
@kalexand-rh kalexand-rh merged commit 0f8ddc9 into openshift:master Feb 10, 2021
@kalexand-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.5

@kalexand-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.6

@kalexand-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link
Copy Markdown

@kalexand-rh: #29096 failed to apply on top of branch "enterprise-4.5":

Applying: Resources migrated and excluded by MTC
Using index info to reconstruct a base tree...
A	modules/migration-mtc-workflow.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/migration-understanding-cam.adoc
CONFLICT (content): Merge conflict in modules/migration-understanding-cam.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 Resources migrated and excluded by MTC
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.5

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
Copy Markdown

@kalexand-rh: new pull request created: #29352

Details

In response to this:

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

@openshift-cherrypick-robot
Copy link
Copy Markdown

@kalexand-rh: new pull request created: #29353

Details

In response to this:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants