Skip to content

Conversation

luxas
Copy link
Member

@luxas luxas commented Feb 18, 2016

Update the DNS template from cluster/addons/dns and combine into one file.
Fixes: #19228 #18227

Related to: #21379 #21357

@fgrzadkowski

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 18, 2016
@k8s-bot
Copy link

k8s-bot commented Feb 18, 2016

GCE e2e test build/test passed for commit 7e48c9eef51feba8ec4d9c8bb3dc56bcdbda0893.

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

Copy link
Contributor

Choose a reason for hiding this comment

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

Why is it that you don't need to set -s flag?

Copy link
Member Author

Choose a reason for hiding this comment

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

The default is -s flag is http://localhost:8080, and that's were apiserver will listen by default for docker-multinode (when running from the same node)
Anyway, it's overkill to specify a separate server option here (the user have to be able to kubectl get po for example)

One may use the -s flag if running kubectl from another node, or export KUBERNETES_MASTER for example. But the user should know that

@deftdawg
Copy link
Contributor

The hypercube install of 1.2.0-alpha8 does not automatically create the kube-system name space (rather it has only "default"). SkyDNS should probably use default or indicate that manually creating the namespace "kubectl create namespace kube-system" will be needed to avoid getting "Error from server: error when creating "./skydns.yaml": namespaces "kube-system" not found"

@gopinatht
Copy link

@luxas @fgrzadkowski It would be great if we can get this merged before the next alpha or beta build. Is there anything I can help with?

@luxas
Copy link
Member Author

luxas commented Feb 22, 2016

@jumpkick I will probably include the creation of kube-system in #21646. Thanks

@gopinatht As soon as #21379 is merged (soon) I'll rebase and this may be LGTM'd, so it will probably be included in the next release.

@thockin thockin added this to the v1.2 milestone Feb 22, 2016
@thockin
Copy link
Member

thockin commented Feb 23, 2016

Thanks for reviewing, Filip.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 25, 2016
@k8s-github-robot
Copy link

PR needs rebase

@luxas luxas force-pushed the fix_certs_for_hyperkube branch from 7e48c9e to cd80bf8 Compare February 25, 2016 19:57
…file. Make DNS working on docker and docker-multinode
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 25, 2016
@luxas luxas force-pushed the fix_certs_for_hyperkube branch from cd80bf8 to e9af6c3 Compare February 25, 2016 20:00
@luxas
Copy link
Member Author

luxas commented Feb 25, 2016

@fgrzadkowski @thockin I copied https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/skydns-rc.yaml.in, bumped to etcd-amd64:2.2.1 and added the kube-system namespace.

Now the two skydns manifests are equal.
PTAL

@k8s-bot
Copy link

k8s-bot commented Feb 25, 2016

GCE e2e build/test failed for commit e9af6c3.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@k8s-bot
Copy link

k8s-bot commented Feb 25, 2016

GCE e2e build/test failed for commit cd80bf8d659c618c4e5ee54edc04fa38d39865d8.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@fgrzadkowski fgrzadkowski added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge and removed needs-ok-to-merge labels Feb 26, 2016
@fgrzadkowski
Copy link
Contributor

@k8s-bot test this; issue #IGNORE

@k8s-bot
Copy link

k8s-bot commented Feb 26, 2016

GCE e2e build/test passed for commit e9af6c3.

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

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Feb 26, 2016
@k8s-github-robot k8s-github-robot merged commit 766657c into kubernetes:master Feb 26, 2016
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. 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.