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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kubeadm add v1beta1 config #69289

Merged
merged 4 commits into from Oct 4, 2018

Conversation

@fabriziopandini
Contributor

fabriziopandini commented Oct 1, 2018

What this PR does / why we need it:
This PR adds v1beta1 version of kubeadm config API.

Which issue(s) this PR fixes:
Ref: kubernetes/kubeadm#911

Special notes for your reviewer:
Sorry about the size of this PR 馃槯

Depends on:

Please consider latest 4 commits:

  • Add a duplicated v1beta1 API
  • Automated bump from v1alpha3 references to v1beta1
  • fix tests
  • (autogenerated)

Release note:

kubeadm: Add a `v1beta1` API.

@kubernetes/sig-cluster-lifecycle-pr-reviews
/sig cluster-lifecycle
/kind api-change
/area kubeadm

/cc @timothysc @luxas @rosti

@rosti

Thank you @fabriziopandini ! At a quick first pass this looks OK. I'll do another, more thorough review tomorrow.

// v1alpha2 -> v1alpha3 migration. As the ComponentConfigs were embedded in the structs
// earlier now have moved out it's not possible to do a lossless roundtrip "the normal way"
// When we support v1alpha3 and higher only, we can reenable this

This comment has been minimized.

@rosti

rosti Oct 1, 2018

Contributor

This probably needs to be moved to #69058

@rosti

rosti Oct 1, 2018

Contributor

This probably needs to be moved to #69058

This comment has been minimized.

@fabriziopandini

fabriziopandini Oct 2, 2018

Contributor

You are right, but I missed that train, so I'm fixing it here

@fabriziopandini

fabriziopandini Oct 2, 2018

Contributor

You are right, but I missed that train, so I'm fixing it here

@timothysc

Minor comments otherwise LGTM
/approve

// for both validation of the practically of the API server from a joining node's point
// of view and as an authentication method for the node in the bootstrap phase of
// "kubeadm join". This token is and should be short-lived
type BootstrapTokenString struct {

This comment has been minimized.

@timothysc

timothysc Oct 2, 2018

Member

So with bootstrap tokens finding a landing home this cycle do we still need this? We've been carrying this for a while now.

@timothysc

timothysc Oct 2, 2018

Member

So with bootstrap tokens finding a landing home this cycle do we still need this? We've been carrying this for a while now.

This comment has been minimized.

@fabriziopandini

fabriziopandini Oct 4, 2018

Contributor

If you don't mind I will iterate on this in a separated PR trying to get rid of the code for bootstrap token management that now is duplicated for each API version

@fabriziopandini

fabriziopandini Oct 4, 2018

Contributor

If you don't mind I will iterate on this in a separated PR trying to get rid of the code for bootstrap token management that now is duplicated for each API version

limitations under the License.
*/
// +k8s:defaulter-gen=TypeMeta

This comment has been minimized.

@timothysc

timothysc Oct 2, 2018

Member

You may need to pull in @neolit123 's recent changes here.

@timothysc

timothysc Oct 2, 2018

Member

You may need to pull in @neolit123 's recent changes here.

This comment has been minimized.

@fabriziopandini

fabriziopandini Oct 4, 2018

Contributor

Done

@fabriziopandini

fabriziopandini Oct 4, 2018

Contributor

Done

@@ -228,6 +229,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

This comment has been minimized.

@timothysc
@timothysc

timothysc Oct 2, 2018

Member

?

This comment has been minimized.

@fabriziopandini

fabriziopandini Oct 4, 2018

Contributor

This gives some info about api version supported by kubeadm command migrate...

@fabriziopandini

fabriziopandini Oct 4, 2018

Contributor

This gives some info about api version supported by kubeadm command migrate...

@@ -231,32 +232,28 @@ func TestImagesPull(t *testing.T) {
}
func TestMigrate(t *testing.T) {
/*
TODO: refactor this to test v1alpha3 --> v1beta1 after introducing v1beta1
cfg := []byte(dedent.Dedent(`

This comment has been minimized.

@timothysc

timothysc Oct 2, 2018

Member

Fine for now, but next time we can break this out as a follow-up PR.

@timothysc

timothysc Oct 2, 2018

Member

Fine for now, but next time we can break this out as a follow-up PR.

@fabriziopandini

This comment has been minimized.

Show comment
Hide comment
@fabriziopandini

fabriziopandini Oct 4, 2018

Contributor

/test pull-kubernetes-integration

Contributor

fabriziopandini commented Oct 4, 2018

/test pull-kubernetes-integration

@timothysc

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Oct 4, 2018

@timothysc timothysc added the approved label Oct 4, 2018

@k8s-ci-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-ci-robot

k8s-ci-robot Oct 4, 2018

Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

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

Contributor

k8s-ci-robot commented Oct 4, 2018

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

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 merged commit 5e3dc7d into kubernetes:master Oct 4, 2018

18 checks passed

cla/linuxfoundation fabriziopandini authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
tide In merge pool.
Details

@fabriziopandini fabriziopandini deleted the fabriziopandini:kubeadm-add-v1beta1 branch Oct 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment