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

Run l7 controller on master #26048

Merged
merged 3 commits into from
May 31, 2016
Merged

Conversation

bprashanth
Copy link
Contributor

Fixes #23663, needs kubernetes-retired/contrib#680
@roberthbailey @kubernetes/goog-cluster

@@ -1,33 +1,26 @@
{% set kube_uid = "" -%}
{% if pillar['kube_uid'] is defined -%}
{% set kube_uid = pillar['kube_uid'] %}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

If gke keeps re-salting clusters it defeats the purpose of file based persistence, and there are too many edge cases anway, so it's safer to maintain and allocate the uid in the l7 pod.

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels May 23, 2016
@roberthbailey
Copy link
Contributor

You'll need to update the gci configs for master as well.

/cc @andyzheng0831 @wonderfly

@bprashanth bprashanth force-pushed the ing_master branch 3 times, most recently from 8b38707 to b535d0c Compare May 30, 2016 22:55
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 30, 2016
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 30, 2016
@k8s-bot
Copy link

k8s-bot commented May 30, 2016

GCE e2e build/test passed for commit c01a058.

@bprashanth
Copy link
Contributor Author

@kubernetes/goog-testing we used to configure logging through e2e/core.go but I don't see that anymore, have we just automated the collection of master logs from /var/log?

@bprashanth
Copy link
Contributor Author

Also updated startup scripts so we deploy an l7 static pod on a gci master too (which is the default currently)

@freehan freehan added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 31, 2016
@freehan
Copy link
Contributor

freehan commented May 31, 2016

LGTM

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 31, 2016
@bprashanth bprashanth added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels May 31, 2016
@bprashanth bprashanth added this to the v1.3 milestone May 31, 2016
@bprashanth
Copy link
Contributor Author

This pr will fix gke ingress e2e flake. GKE is currently infrequently leaking resources because a salt variable reflecting the cluster uid wasn't piped through with the appropriate internal cls. Leaving priority as is because there are few enough prs in the queue.

Lets hope there aren't anymore configuration discrepancies between gce and gke.

@bprashanth
Copy link
Contributor Author

Ok, nope, more people are jumping on the sq, so p1-ing this as a flake fix

@bprashanth bprashanth added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label May 31, 2016
@k8s-github-robot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented May 31, 2016

GCE e2e build/test passed for commit c01a058.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 430bb94 into kubernetes:master May 31, 2016
k8s-github-robot pushed a commit that referenced this pull request Jun 1, 2016
Automatic merge from submit-queue

Collect l7 controller e2e logs

#26048 (comment)
I meant to check e2e output and see if the logs were being collected, but it merged before i could.
@@ -706,9 +705,6 @@ function start-kube-addons {
fi
if [[ "${ENABLE_L7_LOADBALANCING:-}" == "glbc" ]]; then
setup-addon-manifests "addons" "cluster-loadbalancing/glbc"

Choose a reason for hiding this comment

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

This line can be moved into function start-lb-controller

Copy link
Contributor Author

Choose a reason for hiding this comment

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

but then it won't start-lb-controller without the right env vars, which makes the function name a lie right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh, no i guess it can. it splits addon deployment, but consolidates loadbalancer deployment. So ill send a follow up.

Choose a reason for hiding this comment

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

Sorry for late comment, I just came back to office. It is not a functionality problem, just an improvement. So, you don't have to make a PR dedicated for the correction. It is up to you

k8s-github-robot pushed a commit that referenced this pull request Jun 3, 2016
Automatic merge from submit-queue

GCI: correct the fix in #26363

This PR is mainly for correcting the fix to 'find' command in #26363. I added "-maxdepth 1" in an earlier change, and #26363 tried to fix it by changing the search path. This is potentially incorrect, when yaml files are in more than one layer deep. The real fix should be removing the "-maxdepth 1" flag from 'find' command. This PR also updates two minor places in the file configure-helper.sh introduced by two previous PR #26413 and #26048.

@roberthbailey @wonderfly 

cc/ @dchen1107 @fabioy @kubernetes/goog-image
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants