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

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 #62854

Merged
merged 6 commits into from
Apr 25, 2018
Merged

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 #62854

merged 6 commits into from
Apr 25, 2018

Conversation

shyamjvs
Copy link
Member

@shyamjvs shyamjvs commented Apr 19, 2018 •
edited

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

Add support in GCE setup scripts to create cluster with custom network. Also bug-fixes to allow using custom network with IP-aliases.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 19, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Apr 19, 2018
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 19, 2018
@shyamjvs
Copy link
Member Author

This are fixes required to make (ip-alias + custom subnet) combination work for clusters.

/cc @wojtek-t

@shyamjvs shyamjvs added this to the v1.8 milestone Apr 19, 2018
@shyamjvs shyamjvs added kind/bug Categorizes issue or PR as related to a bug. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. status/approved-for-milestone and removed milestone/incomplete-labels labels Apr 19, 2018
@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@jpbetz @shyamjvs @wojtek-t

Pull Request Labels
  • sig/cluster-lifecycle sig/network: Pull Request will be escalated to these SIGs if needed.
  • priority/important-soon: Escalate to the pull request owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@wojtek-t
Copy link
Member

/lgtm
/approve no-issue

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 19, 2018
@BenTheElder
Copy link
Member

/retest

@BenTheElder BenTheElder mentioned this pull request Apr 19, 2018
Closed
@BenTheElder
Copy link
Member

cc @krzyzacy
This still needs cherry pick approval.

@BenTheElder
Copy link
Member

I0420 00:17:29.371] Creating subnet e2e-86992-0a3d25:IP_ALIAS_SUBNETWORK
W0420 00:17:30.014] ..ERROR: (gcloud.beta.compute.networks.subnets.create) Could not fetch resource:
W0420 00:17:30.015] - Invalid value for field 'resource.name': 'IP_ALIAS_SUBNETWORK'. Must be a match of regex '(?:a-z?)'

:/
/retest

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 24, 2018
@shyamjvs
Copy link
Member Author

I solved the problem by adding support for custom-network (which wasn't there earlier on 1.8 and hence SUBNETWORK and CREATE_CUSTOM_NETWORK variables were undefined).

There is still this problem of using 'IP_ALIAS_SUBNETWORK' (that Jeff pointed out above), but we should never use it given that SUBNETWORK should always be set when CREATE_CUSTOM_NETWORK=true. I can fix that and create cherrypicks on other releases but IMO it isn't worth it (unless someone disagrees).

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Apr 24, 2018
wojtek-t
wojtek-t reviewed Apr 24, 2018
View reviewed changes
cluster/gce/config-default.sh Outdated
# If we're using custom network, use the subnet we already create for it as the one for ip-alias.
# Note that this means SUBNETWORK would override KUBE_GCE_IP_ALIAS_SUBNETWORK in case of custom network.
if [[ "${CREATE_CUSTOM_NETWORK}" == true ]]; then
IP_ALIAS_SUBNETWORK="${SUBNETWORK:-IP_ALIAS_SUBNETWORK}"
Copy link
Member

Choose a reason for hiding this comment

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

not fixed here

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct... I explained why I left that unfixed in #62854 (comment)
I can do that if and cherrypick elsewhere if you think it;s worth it.

cluster/gce/config-test.sh Outdated
# If we're using custom network, use the subnet we already create for it as the one for ip-alias.
# Note that this means SUBNETWORK would override KUBE_GCE_IP_ALIAS_SUBNETWORK in case of custom network.
if [[ "${CREATE_CUSTOM_NETWORK}" == true ]]; then
IP_ALIAS_SUBNETWORK="${SUBNETWORK:-IP_ALIAS_SUBNETWORK}"
Copy link
Member

Choose a reason for hiding this comment

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

not fixed here

@wojtek-t
Copy link
Member

I solved the problem by adding support for custom-network (which wasn't there earlier on 1.8 and hence SUBNETWORK and CREATE_CUSTOM_NETWORK variables were undefined).

Ok - thanks.

There is still this problem of using 'IP_ALIAS_SUBNETWORK' (that Jeff pointed out above), but we should never use it given that SUBNETWORK should always be set when CREATE_CUSTOM_NETWORK=true. I can fix that and create cherrypicks on other releases but IMO it isn't worth it (unless someone disagrees).

I disagree. We should fix that at head and cherrypick. But it can be separate PR + separate set of cherrypicks.

/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 24, 2018
@shyamjvs
Copy link
Member Author

SGTM

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 24, 2018
@shyamjvs
Copy link
Member Author

I created #63074 making that fix on HEAD and cherry-picked that commit into this PR (to save creating another one)

@shyamjvs shyamjvs force-pushed the automated-cherry-pick-of-#62172-#62193-#62398-upstream-release-1.8 branch from bc7aa92 to 6a79494 Compare April 24, 2018 13:01
@wojtek-t
Copy link
Member

kubemark is still failing...

@shyamjvs
Copy link
Member Author

Hopefully it works now.

@shyamjvs shyamjvs force-pushed the automated-cherry-pick-of-#62172-#62193-#62398-upstream-release-1.8 branch from e904842 to 69960aa Compare April 24, 2018 14:20
@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

@shyamjvs
Copy link
Member Author

And... kubemark is green.
Could you lgtm?

@shyamjvs
Copy link
Member Author

The other failures seem unrelated.
/retest

@shyamjvs
Copy link
Member Author

/hold cancel
Cancelling hold (ref #62854 (comment)) as 1.8.12 has been cut today morning.
Also marking this as queue-fix since this is blocking PRs on 1.8 due to kubemark failures.

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 24, 2018
@krzyzacy
Copy link
Member

/retest

@BenTheElder
Copy link
Member

grrrr, DNS flakes again :(
/retest

@wojtek-t
Copy link
Member

/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 25, 2018
@k8s-github-robot
Copy link

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit d5419fc into kubernetes:release-1.8 Apr 25, 2018
@shyamjvs shyamjvs deleted the automated-cherry-pick-of-#62172-#62193-#62398-upstream-release-1.8 branch April 25, 2018 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wojtek-t wojtek-t wojtek-t left review comments

Assignees

@jpbetz jpbetz

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/network Categorizes an issue or PR as relevant to SIG Network. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@shyamjvs @k8s-github-robot @wojtek-t @BenTheElder @fejta-bot @jpbetz @ixdy @k8s-ci-robot @krzyzacy