kubeadm: Add a `v1alpha3` API #65629

luxas · 2018-06-29T10:27:14Z

What this PR does / why we need it:
Adds a (now duplicated) v1alpha3 API. Equal to v1alpha2 now, but will be changed later.
Hopefully we'll graduate this to v1beta1 during the v1.12 cycle.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
ref: kubernetes/kubeadm#911
Depends on:

Special notes for your reviewer:

These commits should be reviewed:

Add a duplicated v1alpha3 API: A pure directory copy of the v1alpha2 folder, only changed the package name in the Go files
Register the v1alpha3 API in the scheme, and update the roundtrip API tests, started registering the new API and using it internally
Automated bump from v1alpha2 references to v1alpha3: Replaced all v1alpha2 references with v1alpha3

Release note:

kubeadm: Add a `v1alpha3` API.

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

fabriziopandini

Thanks for this PR
/approve
@timothysc I let you give the final lgtm

timothysc · 2018-07-03T19:13:45Z

let me know when all the rebasing is done.

timothysc · 2018-07-03T21:51:00Z

cmd/kubeadm/app/apis/kubeadm/v1alpha3/bootstraptokenstring.go

+
+// Package v1alpha2 holds the external kubeadm API types of version v1alpha2
+// Note: This file should be kept in sync with the similar one for the internal API
+// TODO: The BootstrapTokenString object should move out to either k8s.io/client-go or k8s.io/api in the future


Now is the time to make this change, it really doesn't belong here.

This is out of scope for this PR, it isn't worse than what we had with v1alpha1 and v1alpha2 really.
Yes, we're gonna fix this very soon, but it doesn't block all of the other PRs I have lined up for the moment

Please file an issue in the kubeadm repo as p1 as it needs to get fixed this cycle.

/cc @fabriziopandini

I added an action item to kubernetes/kubeadm#963 Tracking issue for "Config to v1beta1"

timothysc · 2018-07-03T21:52:58Z

cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_unix.go

+package v1alpha3
+
+// DefaultCACertPath defines default location of CA certificate on Linux
+const DefaultCACertPath = "/etc/kubernetes/pki/ca.crt"


Why is this outside of the rest of the other defaults.

It's branched per OS, there's an other constant for windows.

Again, this is 100% equal to what's in v1alpha2

… tests

fabriziopandini · 2018-07-04T13:04:47Z

This PR sets the ground for the new version of kubeadm API, but doesn't make any change to API types (to be addressed in following PRs along with the related KEP)
/lgtm
/approve

k8s-ci-robot · 2018-07-04T13:07:26Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: fabriziopandini, 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:

~~cmd/kubeadm/OWNERS~~ [fabriziopandini,luxas]
hack/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

luxas · 2018-07-04T13:12:38Z

Self-approving the .golint_failures change. We have that for our v1alpha2 API as well, (due to the apimachinery defaulting code for example)

k8s-github-robot · 2018-07-05T01:52:12Z

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

Automatic merge from submit-queue (batch tested with PRs 65822, 65834, 65859, 65631). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: Add support for reading multiple YAML documents **What this PR does / why we need it**: In preparation for splitting the kubelet and kube-proxy componentconfigs out of the MasterConfiguration API struct, add support for reading multiple YAML documents **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/kubeadm#911 Depends on: - [x] #65776 - [x] #65628 - [x] #65629 **Special notes for your reviewer**: Please only review the `Refactor a bit of the config YAML loading code, and support loading multiple YAML documents` commit **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

…nentconfigs Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: Start using internal versions for ComponentConfigs in the internal API **What this PR does / why we need it**: This PR changes kubeadm to store the internal API versions of the ComponentConfig APIs, in order to in the future be able to read multiple external versions with conversion. It also moves all the ComponentConfigs to a common struct instead of splitting them out in many. This makes it possible to more easily host more ComponentConfigs in the future. In v1alpha3, the ComponentConfigs will later be removed from the external version of the API (see: kubernetes#65787), but for this PR no changes to the external API are made. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/kubeadm#911 Depends on: - [x] kubernetes#65776 - [x] kubernetes#65628 - [x] kubernetes#65629 - [x] kubernetes#65631 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

@timothysc

…om_api Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: Use separate YAML docs for the kubelet and kube-proxy ComponentConfigs **What this PR does / why we need it**: This PR makes kubeadm load the ComponentConfig for the kubelet and kube-proxy from separate YAML documents in the `kubeadm init` config file. This is backwards-compatible with `v1alpha2`. The ComponentConfigs are stored internally in the internal kubeadm `MasterConfiguration` struct, but when marshalling the componentconfigs are written as separate YAML documents. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/kubeadm#911 Depends on: - [x] #65776 - [x] #65628 - [x] #65629 - [x] #65631 - [x] #65940 **Special notes for your reviewer**: Only review the last five commits please. (The last commit is purely autogenerated, so can be skipped) **Release note**: ```release-note kubeadm: Use separate YAML documents for the kubelet and kube-proxy ComponentConfigs ``` @kubernetes/sig-cluster-lifecycle-pr-reviews /assign @timothysc

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Rename `MasterConfiguration` to `InitConfiguration` in the kubeadm v1alpha3 Config API **What this PR does / why we need it**: In v1alpha3, we have made the design decision that `MasterConfiguration` will be renamed `InitConfiguration`. This PR implements that change. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/kubeadm#911 Depends on: - [x] #65776 - [x] #65628 - [x] #65629 - [x] #65631 - [x] #65940 - [x] #65787 **Special notes for your reviewer**: Most of the code is autogenerated, using just find and replace. Please only review commits: - `Automated rename from MasterConfiguration to InitConfiguration` - `Rename MasterConfiguration to InitConfiguration in v1alpha3, but support both names for this release of kubeadm` **Release note**: ```release-note [action required] The `MasterConfiguration` kind in the kubeadm v1alpha2 API has been renamed `InitConfiguration` in v1alpha3 ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

Automatic merge from submit-queue (batch tested with PRs 66138, 65951). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Rename `NodeConfiguration` to `JoinConfiguration` in the kubeadm v1alpha3 Config API **What this PR does / why we need it**: In v1alpha3, we have made the design decision that `NodeConfiguration` will be renamed `JoinConfiguration`. This PR implements that change. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/kubeadm#911 Depends on: - [x] kubernetes#65776 - [x] kubernetes#65628 - [x] kubernetes#65629 - [x] kubernetes#65631 - [x] kubernetes#65940 - [x] kubernetes#65787 - [ ] kubernetes#65945 **Special notes for your reviewer**: Please only review the last three commits here. **Release note**: ```release-note [action required] The `NodeConfiguration` kind in the kubeadm v1alpha2 API has been renamed `JoinConfiguration` in v1alpha3 ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

Automatic merge from submit-queue (batch tested with PRs 63877, 64559, 65952). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: Make the kubeadm config kinds mutually exclusive **What this PR does / why we need it**: Right now it would be possible to feed kubeadm with a YAML document with all the four different Config kinds kubeadm at HEAD supports, `MasterConfiguration`, `InitConfiguration`, `JoinConfiguration` and `NodeConfiguration`. This PR makes them mutually exclusive so that kubeadm can know how to handle the config file properly. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/kubeadm#911 Depends on: - [x] #65776 - [x] #65628 - [x] #65629 - [x] #65631 - [x] #65940 - [x] #65787 - [x] #65945 - [x] #65951 **Special notes for your reviewer**: Please only review the last commit **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

@luxas

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [reissue] kubeadm: Split out ClusterConfiguration from InitConfiguration As @luxas is not able to take care of #66219, I am reissuing the same change here. There are a few minor things added by me: - The original PR is rebased on latest master. - Some broken tests were fixed. - Some TODOs were added. - Run update-bazel and update-gofmt Below is the text of the original PR by Lucas. ----- **What this PR does / why we need it:** Splits MasterConfiguration to InitConfiguration and ClusterConfiguration as outlined in the kubeadm Config KEP. InitConfiguration holds init-only information, and ClusterConfiguration holds cluster-wide information. In the internal representation InitConfiguration wraps ClusterConfiguration as a field, but in serialized format they're different YAML documents. **Which issue(s) this PR fixes** (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged): ref: kubernetes/kubeadm#911 Depends on: - [X] #65776 - [X] #65628 - [X] #65629 - [X] #65631 - [X] #65940 - [X] #65787 - [X] #65945 - [X] #65951 - [X] #65952 **Special notes for your reviewer:** **Release note**: ```release-note kubeadm: InitConfiguration now consists of two structs: InitConfiguration and ClusterConfiguration ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

k8s-ci-robot requested review from chuckha and fabriziopandini June 29, 2018 10:27

luxas assigned timothysc and fabriziopandini Jun 29, 2018

This was referenced Jun 29, 2018

kubeadm: Remove the v1alpha1 API #65628

Merged

kubeadm: Add support for reading multiple YAML documents #65631

Merged

fabriziopandini reviewed Jun 29, 2018

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 30, 2018

luxas force-pushed the kubeadm_add_v1alpha3 branch from 4dc24ed to 526b740 Compare July 3, 2018 18:12

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 3, 2018

luxas force-pushed the kubeadm_add_v1alpha3 branch from 526b740 to 54c2939 Compare July 3, 2018 21:30

timothysc suggested changes Jul 3, 2018

View reviewed changes

luxas mentioned this pull request Jul 3, 2018

kubeadm: Use separate YAML docs for the kubelet and kube-proxy ComponentConfigs #65787

Merged

5 tasks

luxas added 4 commits July 4, 2018 14:05

Add a duplicated v1alpha3 API

e5c0360

Register the v1alpha3 API in the scheme, and update the roundtrip API…

27d7041

… tests

Automated bump from v1alpha2 references to v1alpha3

c9b52ed

autogenerated

7e488e7

luxas force-pushed the kubeadm_add_v1alpha3 branch from 54c2939 to 7e488e7 Compare July 4, 2018 11:08

k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 4, 2018

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 4, 2018

luxas added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 4, 2018

neolit123 mentioned this pull request Jul 4, 2018

Tracking issue for "Config to v1beta1" kubernetes/kubeadm#963

Closed

28 tasks

k8s-ci-robot requested a review from fabriziopandini July 4, 2018 16:18

k8s-github-robot merged commit c3b0ddb into kubernetes:master Jul 5, 2018

luxas mentioned this pull request Jul 5, 2018

kubeadm: update generated files #65844

Merged

luxas mentioned this pull request Jul 15, 2018

kubeadm: Split out ClusterConfiguration from InitConfiguration #66219

Closed

9 tasks

rosti mentioned this pull request Aug 15, 2018

[reissue] kubeadm: Split out ClusterConfiguration from InitConfiguration #67441

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

kubeadm: Add a `v1alpha3` API #65629

kubeadm: Add a `v1alpha3` API #65629

luxas commented Jun 29, 2018 •

edited

Loading

fabriziopandini left a comment

timothysc commented Jul 3, 2018

timothysc Jul 3, 2018

luxas Jul 4, 2018

timothysc Jul 4, 2018

fabriziopandini Jul 4, 2018

timothysc Jul 3, 2018

luxas Jul 4, 2018

luxas Jul 4, 2018

fabriziopandini commented Jul 4, 2018

k8s-ci-robot commented Jul 4, 2018

luxas commented Jul 4, 2018

k8s-github-robot commented Jul 5, 2018

kubeadm: Add a v1alpha3 API #65629

kubeadm: Add a v1alpha3 API #65629

Conversation

luxas commented Jun 29, 2018 • edited Loading

fabriziopandini left a comment

Choose a reason for hiding this comment

timothysc commented Jul 3, 2018

timothysc Jul 3, 2018

Choose a reason for hiding this comment

luxas Jul 4, 2018

Choose a reason for hiding this comment

timothysc Jul 4, 2018

Choose a reason for hiding this comment

fabriziopandini Jul 4, 2018

Choose a reason for hiding this comment

timothysc Jul 3, 2018

Choose a reason for hiding this comment

luxas Jul 4, 2018

Choose a reason for hiding this comment

luxas Jul 4, 2018

Choose a reason for hiding this comment

fabriziopandini commented Jul 4, 2018

k8s-ci-robot commented Jul 4, 2018

luxas commented Jul 4, 2018

k8s-github-robot commented Jul 5, 2018

kubeadm: Add a `v1alpha3` API #65629

kubeadm: Add a `v1alpha3` API #65629

luxas commented Jun 29, 2018 •

edited

Loading