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

Kubeadm upgrade same version #62568

Merged
merged 3 commits into from Apr 18, 2018

Conversation

@liztio
Member

liztio commented Apr 14, 2018

What this PR does / why we need it:

When kubeadm 1.10 came out, it inadvertently introduced a backwards incompatible config change. Because the kubeadm MasterConfiguration is written by the old version of kubeadm and read by the new one, this incompatibility causes the upgrade to fail.

To mitigate this, I've written a simple transform that operates on a map-based version of the config. This map is mutated to make it compatible with the new structure, then serialised to JSON and deserialised by the usual APIMachinery.

Because of complications with the multiple versions, this PR enforces kubeadm only being used to upgrade to kubernetes of the same minor and major versions.

Which issue(s) this PR fixes (optional, in fixes #(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes kubeadm#744
This PR is an alternate take on #62353. Instead of trying to gate migration on versions, this constrains kubeadm to only upgrade versions from the same major and minor versions.

Special notes for your reviewer:

fixes configuration error when upgrading kubeadm from 1.9 to 1.10+
enforces  kubeadm  upgrading kubernetes from the same major and minor versions as the kubeadm binary.

liztio added some commits Apr 10, 2018

Adds migrations to the kubeadm upgrade phase config
This fixes a previous issue with kubeadm where a backwards-incompatible
struct change broke deserialising configs as part of the upgrade.
@liztio

This comment has been minimized.

@k8s-ci-robot

This comment has been minimized.

Contributor

k8s-ci-robot commented Apr 14, 2018

@liztio: Reiterating the mentions to trigger a notification:
@kubernetes/sig-cluster-lifecycle-pr-reviews

In response to this:

/cc @fabriziopandini @timothysc @kubernetes/sig-cluster-lifecycle-pr-reviews

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.

@BenTheElder

/ok-to-test

@BenTheElder

This comment has been minimized.

Member

BenTheElder commented Apr 14, 2018

/ok-to-test

@BenTheElder

This comment has been minimized.

Member

BenTheElder commented Apr 14, 2018

flake
/retest

@timothysc

This comment has been minimized.

Member

timothysc commented Apr 16, 2018

@timothysc

I'm not happy that we have todo this, but at this stage I don't see any other good options until we revamp configs.

/approve

@fabriziopandini has been deeply involved in this PR and I'll pend on his lgtm.

@fabriziopandini

This comment has been minimized.

Contributor

fabriziopandini commented Apr 17, 2018

@timothysc as for discussion in today sig-meeting
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Apr 17, 2018

@k8s-ci-robot

This comment has been minimized.

Contributor

k8s-ci-robot commented Apr 17, 2018

[APPROVALNOTIFIER] This PR is APPROVED

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

This comment has been minimized.

Contributor

k8s-merge-robot commented Apr 18, 2018

Automatic merge from submit-queue (batch tested with PRs 62568, 62220, 62743, 62751, 62753). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-merge-robot k8s-merge-robot merged commit edee03e into kubernetes:master Apr 18, 2018

15 checks passed

Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation liztio 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-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details

@timothysc timothysc added this to the v1.10 milestone Apr 18, 2018

k8s-merge-robot added a commit that referenced this pull request Apr 19, 2018

Merge pull request #62804 from liztio/automated-cherry-pick-of-#62568-…
…upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #62568: Generated build files

Cherry pick of #62568 on release-1.10.

#62568: Generated build files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment