Skip to content
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: Fix an upgrading issue wrt the dynamic kubelet dropin #65104

Merged
merged 1 commit into from Jun 17, 2018

Conversation

@luxas
Copy link
Member

luxas commented Jun 14, 2018

What this PR does / why we need it:
At the moment (will change), this PR does two things:

  • Makes kubeletphase.WriteKubeletDynamicEnvFile run at upgrade time if needed for making v1.10 -> v1.11 upgrades work end to end
  • Fixes so that --dry-run works smoothly on init/upgrade ==> separate PR

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

NONE

@kubernetes/sig-cluster-lifecycle-pr-reviews
/kind bug
/priority critical-urgent
/status approved-for-milestone
/assign @timothysc

@luxas

This comment has been minimized.

Copy link
Member Author

luxas commented Jun 14, 2018

/hold
I'll split the two distinct changes currently included in this PR into two PRs.

@timothysc
Copy link
Member

timothysc left a comment

comments need clarification.

I'm starting to not become a fan of how dryRun percolates across signatures when it's a global knob. It makes more sense to have it be part of the global config. Otherwise we add 0 value mundging all the signature to switch on a bool.

I think at this stage it's too much risk to make that change, but I think we should open an issue for 1.12.

}
err = apiclient.DeleteDeploymentForeground(client, metav1.NamespaceSystem, deploymentToDelete)

err := apiclient.DeleteDeploymentForeground(client, metav1.NamespaceSystem, deploymentToDelete)

This comment has been minimized.

@timothysc

timothysc Jun 14, 2018

Member

why is this not in the dryRun section?

@luxas luxas force-pushed the luxas:kubeadm_v111_more_bugs branch from db2976c to 2104d0e Jun 15, 2018

@k8s-ci-robot k8s-ci-robot added size/M lgtm and removed size/L labels Jun 15, 2018

@timothysc
Copy link
Member

timothysc left a comment

/lgtm
/approve

@luxas

This comment has been minimized.

Copy link
Member Author

luxas commented Jun 15, 2018

/hold cancel

k8s-github-robot pushed a commit that referenced this pull request Jun 15, 2018

Kubernetes Submit Queue
Merge pull request #65151 from luxas/kubeadm_dryrun_bugs
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>.

Fix kubeadm init/upgrade --dry-run mode

**What this PR does / why we need it**:
Split out from #65104.
Fixes `kubeadm init --dry-run` and `kubeadm upgrade apply [version] --dry-run`

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
@kubernetes/sig-cluster-lifecycle-pr-reviews

@luxas luxas force-pushed the luxas:kubeadm_v111_more_bugs branch from 2104d0e to df477a9 Jun 16, 2018

@k8s-ci-robot k8s-ci-robot removed the lgtm label Jun 16, 2018

@dims

This comment has been minimized.

Copy link
Member

dims commented Jun 17, 2018

/lgtm

re-apply lgtm after a rebase

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

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jun 17, 2018

[APPROVALNOTIFIER] This PR is APPROVED

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

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

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jun 17, 2018

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@dims @luxas @timothysc

Pull Request Labels
  • sig/cluster-lifecycle: Pull Request will be escalated to these SIGs if needed.
  • priority/critical-urgent: Never automatically move pull request out of a release milestone; continually escalate to contributor and SIG through all available channels.
  • kind/bug: Fixes a bug discovered during the current release.
Help
@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jun 17, 2018

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

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jun 17, 2018

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

@k8s-github-robot k8s-github-robot merged commit d5c76d8 into kubernetes:master Jun 17, 2018

17 of 18 checks passed

Submit Queue Required Github CI test is not green: pull-kubernetes-kubemark-e2e-gce-big
Details
cla/linuxfoundation luxas 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-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.