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

AWS: add KubernetesClusterID as additional option when VPC is set #42512

Merged
merged 1 commit into from
Apr 3, 2017
Merged

AWS: add KubernetesClusterID as additional option when VPC is set #42512

merged 1 commit into from
Apr 3, 2017

Conversation

scheeles
Copy link
Contributor

@scheeles scheeles commented Mar 4, 2017

This is a small enhancement after the PRs #41695 and #39996

Release Notes

AWS cloud provider: allow to set KubernetesClusterID or KubernetesClusterTag in combination with VPC.

@k8s-ci-robot
Copy link
Contributor

Hi @scheeles. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

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.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 4, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Mar 4, 2017
@scheeles
Copy link
Contributor Author

scheeles commented Mar 4, 2017

@justinsb can you check and approve?

@liggitt liggitt assigned justinsb and unassigned liggitt Mar 17, 2017
@sttts
Copy link
Contributor

sttts commented Mar 22, 2017

@k8s-bot ok to test

@sttts
Copy link
Contributor

sttts commented Mar 22, 2017

@justinsb can you take a look?

@sttts
Copy link
Contributor

sttts commented Mar 22, 2017

@k8s-bot non-cri e2e test this

@sttts sttts added this to the v1.7 milestone Mar 22, 2017
justinsb
justinsb approved these changes Apr 3, 2017
View reviewed changes
Copy link
Member

@justinsb justinsb left a comment

Choose a reason for hiding this comment

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

LGTM

@justinsb
Copy link
Member

justinsb commented Apr 3, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 3, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, scheeles

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2017
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 43925, 42512)

@k8s-github-robot k8s-github-robot merged commit 4ee6782 into kubernetes:master Apr 3, 2017
@k8s-ci-robot
Copy link
Contributor

@scheeles: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins GCE e2e fd09bb6 link @k8s-bot cvm gce e2e test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@sttts sttts modified the milestones: v1.6, v1.7 Apr 4, 2017
@scheeles scheeles mentioned this pull request Apr 4, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Apr 5, 2017
Merge pull request #44036 from kubermatic/automated-cherry-pick-of-#4…
c8d80fa 
…2512-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #42512

Cherry pick of #42512 on release-1.6.

#42512: AWS: add KubernetesClusterID as additional option when VPC is
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.6" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

mintzhao pushed a commit to mintzhao/kubernetes that referenced this pull request Jun 1, 2017
Merge pull request kubernetes#44036 from kubermatic/automated-cherry-…
f36b623 
…pick-of-#42512-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of kubernetes#42512

Cherry pick of kubernetes#42512 on release-1.6.

kubernetes#42512: AWS: add KubernetesClusterID as additional option when VPC is
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb approved these changes

Assignees

@justinsb justinsb

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.
8 participants
@scheeles @k8s-ci-robot @k8s-reviewable @sttts @justinsb @k8s-github-robot @k8s-cherrypick-bot @liggitt