kubeadm: Remove the v1alpha1 API #65628

luxas · 2018-06-29T10:23:20Z

What this PR does / why we need it:
In v1.10 and earlier, kubeadm only had the v1alpha1 API.
In v1.11, kubeadm could read v1alpha1 configs, but only write v1alpha2 configs
In v1.12, kubeadm can read v1alpha2 configs, but only write v1alpha3 or v1beta1 configs.

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: #65776

Special notes for your reviewer:

Release note:

[action required] kubeadm: The `v1alpha1` config API has been removed.
Please convert your `v1alpha1` configuration files to `v1alpha2` using the
`kubeadm config migrate` command of kubeadm v1.11.x

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

luxas · 2018-06-29T10:30:56Z

cmd/kubeadm/app/cmd/config.go

@@ -161,7 +160,7 @@ func NewCmdConfigMigrate(out io.Writer) *cobra.Command {
 			locally in the CLI tool without ever touching anything in the cluster.
 			In this version of kubeadm, the following API versions are supported:
 			- %s
-			- %s
+			- TODO: kubeadm.k8s.io/v1beta1


Fixed in #65629

fabriziopandini

Looks great!
/approve
@timothysc I let you give the final lgtm

neolit123 · 2018-06-29T15:06:42Z

@luxas @fabriziopandini @timothysc
hm, so if someone tries to build from master somewhere before 1.12 is released and tries to config migrate an old v1alpha1 laying around, it would not work, because v1alpha1 is removed? he/she would have to move the HEAD before these commits got in or download the 1.11.x release binaries that still have the functionality?

timothysc

Please extract the generic cleanup work into a separate PR. It looks like there are separate distinct changes that can/should be reviewed separately.

timothysc

/lgtm

on last two commits but will require a rebase

/hold

k8s-ci-robot · 2018-07-03T17:54:27Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, luxas, timothysc

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,timothysc]

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 · 2018-07-03T21:13:52Z

New changes are detected. LGTM label has been removed.

@timothysc

Automatic merge from submit-queue (batch tested with PRs 65776, 64896). 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: Stop using/supporting the v1alpha1 Config API **What this PR does / why we need it**: In v1.10 and earlier, kubeadm only had the v1alpha1 API. In v1.11, kubeadm could read v1alpha1 configs, but only write v1alpha2 configs In v1.12, kubeadm can read v1alpha2 configs, but only write v1alpha3 or v1beta1 configs. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Part of #65628 ref: kubernetes/kubeadm#911 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews /assign @timothysc

luxas · 2018-07-04T07:49:00Z

/hold cancel
Rebased on top of #65776

k8s-github-robot · 2018-07-04T10:29:01Z

Automatic merge from submit-queue (batch tested with PRs 65628, 65573). 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 64593, 65117, 65629, 65827, 65686). 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 a `v1alpha3` API **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: - [x] #65776 - [x] #65628 **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**: ```release-note kubeadm: Add a `v1alpha3` API. ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

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 timothysc and xiangpengzhao June 29, 2018 10:23

luxas mentioned this pull request Jun 29, 2018

kubeadm: Add a v1alpha3 API #65629

Merged

2 tasks

luxas assigned timothysc and fabriziopandini Jun 29, 2018

luxas commented Jun 29, 2018

View reviewed changes

fabriziopandini approved these changes Jun 29, 2018

View reviewed changes

luxas mentioned this pull request Jun 29, 2018

kubeadm: Add support for reading multiple YAML documents #65631

Merged

3 tasks

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

timothysc suggested changes Jul 3, 2018

View reviewed changes

luxas mentioned this pull request Jul 3, 2018

kubeadm: Stop using/supporting the v1alpha1 Config API #65776

Merged

luxas force-pushed the kubeadm_remove_v1alpha1 branch from cbcd763 to d8ce0f2 Compare July 3, 2018 17:48

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

timothysc approved these changes Jul 3, 2018

View reviewed changes

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jul 3, 2018

luxas force-pushed the kubeadm_remove_v1alpha1 branch from d8ce0f2 to 74ddc2e Compare July 3, 2018 21:13

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

luxas mentioned this pull request Jul 3, 2018

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

Merged

5 tasks

Remove the v1alpha1 API folder

dea6f7e

luxas force-pushed the kubeadm_remove_v1alpha1 branch from 74ddc2e to dea6f7e Compare July 4, 2018 07:46

k8s-ci-robot added release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jul 4, 2018

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2018

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

k8s-github-robot merged commit 43706e0 into kubernetes:master Jul 4, 2018

neolit123 mentioned this pull request Jul 4, 2018

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

Closed

28 tasks

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: Remove the v1alpha1 API #65628

kubeadm: Remove the v1alpha1 API #65628

luxas commented Jun 29, 2018 •

edited

Loading

luxas Jun 29, 2018

fabriziopandini left a comment

neolit123 commented Jun 29, 2018

timothysc left a comment

timothysc left a comment

k8s-ci-robot commented Jul 3, 2018

k8s-ci-robot commented Jul 3, 2018

luxas commented Jul 4, 2018

k8s-github-robot commented Jul 4, 2018

kubeadm: Remove the v1alpha1 API #65628

kubeadm: Remove the v1alpha1 API #65628

Conversation

luxas commented Jun 29, 2018 • edited Loading

luxas Jun 29, 2018

Choose a reason for hiding this comment

fabriziopandini left a comment

Choose a reason for hiding this comment

neolit123 commented Jun 29, 2018

timothysc left a comment

Choose a reason for hiding this comment

timothysc left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Jul 3, 2018

k8s-ci-robot commented Jul 3, 2018

luxas commented Jul 4, 2018

k8s-github-robot commented Jul 4, 2018

luxas commented Jun 29, 2018 •

edited

Loading