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

kubeadm - do not generate etcd ca/certs for external etcd #63806

Merged
merged 1 commit into from May 14, 2018

Conversation

Projects
None yet
4 participants
@detiber
Copy link
Member

detiber commented May 14, 2018

What this PR does / why we need it:

Currently we generate an etcd CA and certificates even if we are specifying an external etcd cluster when running kubeadm init, this PR changes this behavior to skip generating the etcd CA and certificates if configured for an external etcd cluster.

Which issue(s) this PR fixes
Fixes kubernetes/kubeadm#807

Release note:

kubeadm will no longer generate an unused etcd CA and certificates when configured to use an external etcd cluster.
kubeadm - do not generate etcd ca/certs for external etcd
Only generate the etcd CA and certificates if not configured for external
etcd.
@detiber

This comment has been minimized.

Copy link
Member Author

detiber commented May 14, 2018

@luxas

luxas approved these changes May 14, 2018

Copy link
Member

luxas left a comment

Thanks for this bugfix @detiber!
I think we might wanna backport this later as well

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label May 14, 2018

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented May 14, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: detiber, luxas

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-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented May 14, 2018

Automatic merge from submit-queue (batch tested with PRs 63588, 63806). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 2860bd5 into kubernetes:master May 14, 2018

16 checks passed

Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation detiber authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details

k8s-github-robot pushed a commit that referenced this pull request May 29, 2018

Kubernetes Submit Queue
Merge pull request #64221 from chuckha/automated-cherry-pick-of-#6380…
…6-upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #63806: kubeadm - do not generate etcd ca/certs for external etcd

Cherry pick of #63806 on release-1.10.

#63806: kubeadm - do not generate etcd ca/certs for external etcd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.