kubeadm: Add (duplicated) v1alpha2 Config API #63788

luxas · 2018-05-14T11:21:37Z

What this PR does / why we need it:
Work in progress PR to add a (initially duplicated) v1alpha2 we can iterate on during the 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):
Part of kubernetes/community#2131

Special notes for your reviewer:
This PR depends on:

The first commit is from #63799.
The second commit duplicates v1alpha1, but updates timestamps, and doesn't require the upgrade.go.
The third commit does the mechanical bump of using v1alpha1 -> v1alpha2
The fourth commit updates bazel

Release note:

[action required] kubeadm now uses an upgraded API version for the configuration file, `kubeadm.k8s.io/v1alpha2`. kubeadm in v1.11 will still be able to read `v1alpha1` configuration, and will automatically convert the configuration to `v1alpha2` internally and when storing the configuration in the ConfigMap in the cluster.

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

liztio · 2018-05-14T15:55:05Z

cmd/kubeadm/app/apis/kubeadm/v1alpha2/register.go

@@ -0,0 +1,66 @@
+/*
+Copyright 2016 The Kubernetes Authors.


may as well bump this to 2018

liztio · 2018-05-14T16:38:48Z

cmd/kubeadm/app/apis/kubeadm/v1alpha2/upgrade_test.go

@@ -0,0 +1,137 @@
+/*


probably don't need to copy this over? or if we do, we should delete it from v1alpha1

oh, I will delete this. This isn't needed in v1alpha2

liztio · 2018-05-14T16:42:38Z

cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go

+	return nil
+}
+
+func Convert_v1alpha1_MasterConfiguration_To_kubeadm_MasterConfiguration(in *MasterConfiguration, out *kubeadm.MasterConfiguration, s conversion.Scope) error {


does this handle the proxy featureflags?

No, Migrate takes care of that, as that happens at unmarshal time, not conversion time

liztio · 2018-05-14T16:55:16Z

this may be easier to read once #63782 is rebased onto it

luxas · 2018-05-14T17:38:49Z

this may be easier to read once #63782 is rebased onto it

yes, very much easier after the first PRs are merged.

timothysc · 2018-05-14T20:21:43Z

I'll wait on this till the other ones are fix'd up. Please ping when this one is ready.

liztio

I think next time it would've been better to add the code in one PR, then switch it as the default in the next one. But I understand we were under a time crunch.

liztio · 2018-05-15T14:25:51Z

/lgtm

fejta-bot · 2018-05-15T16:36:50Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

fejta-bot · 2018-05-15T19:24:51Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

timothysc · 2018-05-15T21:22:24Z

poke when this is all ready to go.

luxas · 2018-05-15T21:36:30Z

This is ready to go, if you only review 9a26430
The first commit is #63799 and the others autogenerated stuff

fejta-bot · 2018-05-15T23:57:50Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

fejta-bot · 2018-05-16T02:24:50Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

fejta-bot · 2018-05-16T05:12:50Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

fejta-bot · 2018-05-16T07:18:52Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

k8s-ci-robot · 2018-05-16T09:00:49Z

New changes are detected. LGTM label has been removed.

luxas · 2018-05-16T11:32:48Z

Readding the LGTM label, I just rebased upon #63799.
Readding approved label as well as I had to add the API package to hack/.golint_failures. Unnecessary to ask for approval from hack/OWNERS for that.

k8s-ci-robot · 2018-05-16T11:33:07Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

k8s-github-robot · 2018-05-16T12:15:29Z

/test all [submit-queue is verifying that this PR is safe to merge]

k8s-github-robot · 2018-05-16T13:13:38Z

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@dims

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: Remove the `.CloudProvider` and `.PrivilegedPods` configuration option **What this PR does / why we need it**: Removes the `.CloudProvider` option, it has been experimental for a long time. People should now use external cloud providers, which is beta in v1.11. Most importantly, you can get the exact same behavior in the API by utilizing the `.*ExtraArgs` and `.*ExtraVolumes` fields. Removes `.PrivilegedPods` as that serves a super small edge case with the legacy cloud provider, and only for openstack. **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 kubernetes/community#2131 **Special notes for your reviewer**: Depends on PRs: - [x] #63799 - [x] #63788 **Release note**: ```release-note [action required] In the new v1alpha2 kubeadm Configuration API, the `.CloudProvider` and `.PrivilegedPods` fields don't exist anymore. Instead, you should use the out-of-tree cloud provider implementations which are beta in v1.11. If you have to use the legacy in-tree cloud providers, you can rearrange your config like the example below. If you need to use the `.PrivilegedPods` functionality, you can still edit the manifests in `/etc/kubernetes/manifests/`, and set `.SecurityContext.Privileged=true` for the apiserver and controller manager. --- kind: MasterConfiguration apiVersion: kubeadm.k8s.io/v1alpha2 apiServerExtraArgs: cloud-provider: "{cloud}" cloud-config: "{path}" apiServerExtraVolumes: - name: cloud hostPath: "{path}" mountPath: "{path}" controllerManagerExtraArgs: cloud-provider: "{cloud}" cloud-config: "{path}" controllerManagerExtraVolumes: - name: cloud hostPath: "{path}" mountPath: "{path}" --- ``` @kubernetes/sig-cluster-lifecycle-pr-reviews @dims @liztio

@liztio

Automatic merge from submit-queue (batch tested with PRs 63871, 63927, 63966, 63957, 63844). 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: Remove the never-used .Etcd.SelfHosted field **What this PR does / why we need it**: These API types were added to support the self-hosting etcd feature, which in the end never was merged. Hence these API types are unused and should be removed. Perfect timing to do that is now in our new `v1alpha2` scheme. **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 kubernetes/community#2131 **Special notes for your reviewer**: Depends on PRs: - [x] #63799 - [x] #63788 **Release note**: ```release-note kubeadm has removed `.Etcd.SelfHosting` from its configuration API. It was never used in practice. ``` @kubernetes/sig-cluster-lifecycle-pr-reviews @liztio

@liztio

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>. Add roundtrip, defaulting, upgrading and validation unit tests for the kubeadm API types **What this PR does / why we need it**: Follows up from #63799, as well as net-new unit testing for our serialization/deserialization package. This tests our API machinery pretty much end to end. This is more important now given we now support two external types: #63788 **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 kubernetes/community#2131 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews @liztio

k8s-ci-robot requested review from dixudx and kad May 14, 2018 11:21

k8s-ci-robot added the area/kubeadm label May 14, 2018

luxas assigned timothysc May 14, 2018

liztio reviewed May 14, 2018

View reviewed changes

luxas force-pushed the kubeadm_add_v1alpha2 branch from 85558f8 to e9a1010 Compare May 15, 2018 13:55

luxas changed the title ~~[WIP] kubeadm: Add v1alpha2 Config API~~ kubeadm: Add (duplicated) v1alpha2 Config API May 15, 2018

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 15, 2018

liztio approved these changes May 15, 2018

View reviewed changes

k8s-ci-robot assigned liztio May 15, 2018

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

luxas mentioned this pull request May 15, 2018

kubeadm: Remove the .CloudProvider and .PrivilegedPods configuration option #63866

Merged

2 tasks

liztio mentioned this pull request May 15, 2018

kubeadm: Restructure internal config usage and fix bugs #63799

Merged

This was referenced May 15, 2018

kubeadm: Remove .ClusterName but add .Metadata to the config API #63869

Closed

kubeadm: Remove the never-used .Etcd.SelfHosted field #63871

Merged

luxas added 4 commits May 16, 2018 09:43

kubeadm: Add duplicated v1alpha2 API types

56846a8

kubeadm: Register and support loading the v1alpha2 API types

96d2bbb

autogenerated move to reference the v1alpha2 API inside of kubeadm

e28242a

autogenerated

fbfe6cf

luxas force-pushed the kubeadm_add_v1alpha2 branch from e9a1010 to fbfe6cf Compare May 16, 2018 09:00

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

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 16, 2018

Ignore golint failure for v1alpha2, as the failing code is autogenerated

792d028

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

luxas added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 16, 2018

luxas mentioned this pull request May 16, 2018

Add roundtrip, defaulting, upgrading and validation unit tests for the kubeadm API types #63917

Merged

k8s-github-robot merged commit 254664d into kubernetes:master May 16, 2018

dixudx mentioned this pull request May 24, 2018

kubeadm: Use the release-1.11 branch by default #63919

Closed

luxas mentioned this pull request Jun 12, 2018

v1alpha2 versioning for kubeadm configuration structs kubernetes/kubeadm#750

Closed

joejulian mentioned this pull request Aug 7, 2018

[CMS-272] Use kubeadm.k8s.io/v1alpha1 and cleanup before installation. samsung-cnct/cluster-api-provider-ssh#43

Merged

rvasilev mentioned this pull request Oct 8, 2018

MasterConfiguration should be changed to support more recent k8 xetys/hetzner-kube#198

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

kubeadm: Add (duplicated) v1alpha2 Config API #63788

kubeadm: Add (duplicated) v1alpha2 Config API #63788

luxas commented May 14, 2018 •

edited

Loading

liztio May 14, 2018

liztio May 14, 2018

luxas May 14, 2018

liztio May 14, 2018

luxas May 14, 2018

liztio commented May 14, 2018

luxas commented May 14, 2018

timothysc commented May 14, 2018

liztio left a comment

liztio commented May 15, 2018

fejta-bot commented May 15, 2018

fejta-bot commented May 15, 2018

timothysc commented May 15, 2018

luxas commented May 15, 2018

fejta-bot commented May 15, 2018

fejta-bot commented May 16, 2018

fejta-bot commented May 16, 2018

fejta-bot commented May 16, 2018

k8s-ci-robot commented May 16, 2018

luxas commented May 16, 2018

k8s-ci-robot commented May 16, 2018

k8s-github-robot commented May 16, 2018

k8s-github-robot commented May 16, 2018

kubeadm: Add (duplicated) v1alpha2 Config API #63788

kubeadm: Add (duplicated) v1alpha2 Config API #63788

Conversation

luxas commented May 14, 2018 • edited Loading

liztio May 14, 2018

Choose a reason for hiding this comment

liztio May 14, 2018

Choose a reason for hiding this comment

luxas May 14, 2018

Choose a reason for hiding this comment

liztio May 14, 2018

Choose a reason for hiding this comment

luxas May 14, 2018

Choose a reason for hiding this comment

liztio commented May 14, 2018

luxas commented May 14, 2018

timothysc commented May 14, 2018

liztio left a comment

Choose a reason for hiding this comment

liztio commented May 15, 2018

fejta-bot commented May 15, 2018

fejta-bot commented May 15, 2018

timothysc commented May 15, 2018

luxas commented May 15, 2018

fejta-bot commented May 15, 2018

fejta-bot commented May 16, 2018

fejta-bot commented May 16, 2018

fejta-bot commented May 16, 2018

k8s-ci-robot commented May 16, 2018

luxas commented May 16, 2018

k8s-ci-robot commented May 16, 2018

k8s-github-robot commented May 16, 2018

k8s-github-robot commented May 16, 2018

luxas commented May 14, 2018 •

edited

Loading