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

🐛 Make KCP supporting external etcd #3298

Merged

Conversation

fabriziopandini
Copy link
Member

@fabriziopandini fabriziopandini commented Jul 7, 2020

What this PR does / why we need it:
This PR makes KCP supporting external etcd. While investigating this issue I discovered that the CAPBK support for external etcd is broken for joining control-planes (original PR) because we are not managing a flexible list of certificates here.

Now this should be fixed, but in order to get this working we are preserving the ClusterConfiguration in all the KubeadmConfig generated by KCP, and this is a kind of duplicate of the machine annotation recently added.
I'm opening an issue to sort out a common approach.

Which issue(s) this PR fixes:
Fixes #3242

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 7, 2020
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 7, 2020
@fabriziopandini
Copy link
Member Author

/cc zanghao2

@k8s-ci-robot
Copy link
Contributor

@fabriziopandini: GitHub didn't allow me to request PR reviews from the following users: zanghao2.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc zanghao2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 24, 2020
@fabriziopandini
Copy link
Member Author

@vincepri is there an expected milestone for this PR?

@vincepri
Copy link
Member

vincepri commented Aug 3, 2020

Let's rebase and re-review, I haven't had enough time to go through the PR. This can probably go in v0.3.9

/milestone v0.3.9

@k8s-ci-robot k8s-ci-robot added this to the v0.3.9 milestone Aug 3, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2020
@fabriziopandini
Copy link
Member Author

rebased

@@ -112,29 +113,53 @@ func NewCertificatesForInitialControlPlane(config *v1beta1.ClusterConfiguration)
}

// NewCertificatesForJoiningControlPlane gets any certs that exist and writes them to disk
func NewCertificatesForJoiningControlPlane() Certificates {
return Certificates{
func NewCertificatesForJoiningControlPlane(config *v1beta1.ClusterConfiguration) Certificates {
Copy link
Member

Choose a reason for hiding this comment

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

This is a breaking change, we should deprecate this function in favor of a different one

Copy link
Member Author

Choose a reason for hiding this comment

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

@vincepri done
wondering if there is a way to avoid the WithConfig in the name of the new func once we deprecate this one...

@fabriziopandini
Copy link
Member Author

@vincepri func renamed and commits squashed

Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/assign @ncdc @detiber

@ncdc
Copy link
Contributor

ncdc commented Aug 25, 2020

LGTM. @detiber @randomvariable do you want to review / do you have time?

@randomvariable
Copy link
Member

👀

@randomvariable
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 Aug 25, 2020
@ncdc
Copy link
Contributor

ncdc commented Aug 25, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncdc

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 Aug 25, 2020
@k8s-ci-robot k8s-ci-robot merged commit 0e52218 into kubernetes-sigs:master Aug 25, 2020
@fabriziopandini fabriziopandini deleted the kcp-external-etcd branch August 28, 2020 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. 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.

Using external etcd can not update kcp status
6 participants