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.

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

Fix IP-alias subnet creation logic #62193

Merged
merged 1 commit into from
Apr 6, 2018

Conversation

shyamjvs
Copy link
Member

@shyamjvs shyamjvs commented Apr 6, 2018

Follows #62172

This fixes the failures happening when using ip-alias with custom network. The subnet name shouldn't be checked against the default value during creation, but just created if not present (as it's name can be different than default based on the value of KUBE_GCE_IP_ALIAS_SUBNETWORK).

/cc @wojtek-t

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 6, 2018
@shyamjvs shyamjvs added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. labels Apr 6, 2018
@wojtek-t
Copy link
Member

wojtek-t commented Apr 6, 2018

/lgtm
/approve no-issue

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: shyamjvs, wojtek-t

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

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

/test all [submit-queue is verifying that this PR is safe to merge]

@shyamjvs
Copy link
Member Author

shyamjvs commented Apr 6, 2018

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit f79ab9c into kubernetes:master Apr 6, 2018
@shyamjvs shyamjvs deleted the ip-alias-fix branch April 6, 2018 14:06
@shyamjvs
Copy link
Member Author

Ref #62267

k8s-github-robot pushed a commit that referenced this pull request Apr 19, 2018
#62193-#62398-upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #62172: When using custom network with IP-alias, use the former's #62193: Fix IP-alias subnet creation logic #62398: Fix subnet cleanup logic when using IP-aliases with custom

Cherry pick of #62172 #62193 #62398 on release-1.10.

#62172: When using custom network with IP-alias, use the former's
#62193: Fix IP-alias subnet creation logic
#62398: Fix subnet cleanup logic when using IP-aliases with custom

```release-note
NONE
```
k8s-github-robot pushed a commit that referenced this pull request Apr 24, 2018
#62193-#62398-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #62172: When using custom network with IP-alias, use the former's #62193: Fix IP-alias subnet creation logic #62398: Fix subnet cleanup logic when using IP-aliases with custom

Cherry pick of #62172 #62193 #62398 on release-1.9.

#62172: When using custom network with IP-alias, use the former's
#62193: Fix IP-alias subnet creation logic
#62398: Fix subnet cleanup logic when using IP-aliases with custom

```release-note
Bugfixes allowing use of IP-aliases with custom-mode network in GCE setup scripts.
```
k8s-github-robot pushed a commit that referenced this pull request Apr 25, 2018
#62193-#62398-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #62172: When using custom network with IP-alias, use the former's #62193: Fix IP-alias subnet creation logic #62398: Fix subnet cleanup logic when using IP-aliases with custom

Cherry pick of #62172 #62193 #62398 on release-1.8.

#62172: When using custom network with IP-alias, use the former's
#62193: Fix IP-alias subnet creation logic
#62398: Fix subnet cleanup logic when using IP-aliases with custom

```release-note
Add support in GCE setup scripts to create cluster with custom network. Also bug-fixes to allow using custom network with IP-aliases.
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants