Skip to content

Windows containers GA #24905

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
Merged
codyhoag merged 1 commit into from
Dec 14, 2020
Merged

Windows containers GA #24905

codyhoag merged 1 commit into from
Dec 14, 2020

Conversation

@codyhoag
Copy link
Contributor

@codyhoag codyhoag commented Aug 19, 2020 •
edited
Loading

@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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 19, 2020
@openshift-docs-preview-bot
Copy link

openshift-docs-preview-bot commented Aug 19, 2020

The preview will be available shortly at:

@codyhoag codyhoag force-pushed the windows-containers branch from 26c40da to af6a606 Compare August 21, 2020 15:47
@codyhoag
Copy link
Contributor Author

codyhoag commented Aug 21, 2020

Preview: https://windows-containers--ocpdocs.netlify.app/openshift-enterprise/latest/windows-containers/understanding-windows-containers.html

@codyhoag codyhoag force-pushed the windows-containers branch 2 times, most recently from 64483cb to 3005123 Compare August 21, 2020 18:56
aravindhp
aravindhp reviewed Aug 24, 2020
View reviewed changes
@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 29, 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 9, 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 9, 2020
@codyhoag codyhoag force-pushed the windows-containers branch 2 times, most recently from 2ab7212 to a5e6336 Compare November 10, 2020 21:49
@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 12, 2020
@codyhoag
Copy link
Contributor Author

codyhoag commented Nov 13, 2020 •
edited
Loading

Previews for drafted sections:

Also added Configuring hybrid networking, which will need to be reviewed by the Networking team.

@codyhoag
Copy link
Contributor Author

codyhoag commented Nov 13, 2020

@weliang1 can you review the new section on configuring hybrid networking in this commit?: 858f8dd60e2df6de13465e0e6ae3e285c5e094a3. This is in preperation for the Windows containers release, which relies on hybrid OVNKubernetes. Thanks!

Preview: https://windows-containers--ocpdocs.netlify.app/openshift-enterprise/latest/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.html

aravindhp
aravindhp suggested changes Nov 18, 2020
View reviewed changes
Copy link

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

Thanks for working on this, @codyhoag. Please address my comments.

LorbusChris
LorbusChris reviewed Nov 18, 2020
View reviewed changes
aravindhp
aravindhp reviewed Nov 18, 2020
View reviewed changes
LorbusChris
LorbusChris reviewed Nov 18, 2020
View reviewed changes
LorbusChris
LorbusChris reviewed Nov 18, 2020
View reviewed changes
ahardin-rh
ahardin-rh reviewed Dec 4, 2020
View reviewed changes
@ahardin-rh ahardin-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Dec 4, 2020
@ahardin-rh
Copy link
Contributor

ahardin-rh commented Dec 4, 2020

@codyhoag Just some minor comments from me. I offered a few suggestions around Docker terminology, but look forward to hearing what PM says about the usage. Good work! 🚀

@codyhoag codyhoag force-pushed the windows-containers branch 2 times, most recently from ab0bb79 to c965e4a Compare December 7, 2020 16:19
@codyhoag codyhoag force-pushed the windows-containers branch 3 times, most recently from d4f04dd to a0ad895 Compare December 10, 2020 20:11
aravindhp
aravindhp reviewed Dec 11, 2020
View reviewed changes
Copy link

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 11, 2020

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2020
@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 14, 2020

We have green light to merge for upcoming GA launch. Merging now.

cc @vikram-redhat

@codyhoag codyhoag merged commit fa93c7b into openshift:master Dec 14, 2020
@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 14, 2020 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 14, 2020 •
edited by openshift-ci-robot
Loading

@codyhoag: #24905 failed to apply on top of branch "enterprise-4.7":

Applying: Windows containers GA
.git/rebase-apply/patch:5801: trailing whitespace.
+ 
.git/rebase-apply/patch:6672: trailing whitespace.
You can remove a Windows node by deleting its host Windows machine. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	installing/installing_aws/installing-aws-network-customizations.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_aws/installing-aws-network-customizations.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _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 Windows containers GA
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.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.

@codyhoag
Copy link
Contributor Author

codyhoag commented Dec 14, 2020 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 14, 2020 •
edited by openshift-ci-robot
Loading

@codyhoag: #24905 failed to apply on top of branch "enterprise-4.6":

Applying: Windows containers GA
.git/rebase-apply/patch:5801: trailing whitespace.
+ 
.git/rebase-apply/patch:6672: trailing whitespace.
You can remove a Windows node by deleting its host Windows machine. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	installing/installing_aws/installing-aws-network-customizations.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_aws/installing-aws-network-customizations.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _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 Windows containers GA
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.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.

This was referenced Dec 14, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ahardin-rh ahardin-rh ahardin-rh left review comments

+6 more reviewers

@jboxman jboxman jboxman left review comments

@aravindhp aravindhp aravindhp requested changes

@LorbusChris LorbusChris LorbusChris left review comments

@Anandnatraj Anandnatraj Anandnatraj left review comments

@VaishnaviHire VaishnaviHire VaishnaviHire left review comments

@sgaoshang sgaoshang sgaoshang left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@aravindhp aravindhp

Labels

branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.