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

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

Merged
merged 1 commit into from
May 14, 2018
Merged

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

merged 1 commit into from
May 14, 2018

Conversation

detiber
Copy link
Member

@detiber 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.

@detiber
kubeadm - do not generate etcd ca/certs for external etcd
187ef17 
Only generate the etcd CA and certificates if not configured for external
etcd.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels May 14, 2018
@k8s-ci-robot k8s-ci-robot requested review from dixudx and kad May 14, 2018 16:03
@detiber detiber mentioned this pull request May 14, 2018
Merged
@detiber
Copy link
Member Author

detiber commented May 14, 2018

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews

luxas
luxas approved these changes May 14, 2018
View reviewed changes
Copy link
Member

@luxas luxas left a comment

Choose a reason for hiding this comment

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

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 "Looks good to me", indicates that a PR is ready to be merged. label May 14, 2018
@k8s-ci-robot
Copy link
Contributor

[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-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2018
@k8s-github-robot
Copy link

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
@chuckha chuckha mentioned this pull request May 23, 2018
Merged
k8s-github-robot pushed a commit that referenced this pull request May 29, 2018
Merge pull request #64221 from chuckha/automated-cherry-pick-of-#6380…
b4e2155 
…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
@seh seh mentioned this pull request Jun 14, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luxas luxas luxas approved these changes

@dixudx dixudx Awaiting requested review from dixudx

@kad kad Awaiting requested review from kad

Assignees

@luxas luxas

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

"kubeadm init" doesn't recognize external etcd configuration
4 participants
@detiber @k8s-ci-robot @k8s-github-robot @luxas