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: stop setting UID in the kubelet ConfigMap #66341

Merged
merged 1 commit into from Jul 20, 2018

Conversation

@runiq
Copy link
Contributor

runiq commented Jul 18, 2018

What this PR does / why we need it: kubeadm: stop setting UID in the kubelet ConfigMap

Which issue(s) this PR fixes:

Fixes kubernetes/kubeadm#921

Release note:

kubeadm: stop setting UID in the kubelet ConfigMap
@neolit123

This comment has been minimized.

Copy link
Member

neolit123 commented Jul 18, 2018

thanks for the PR @runiq
we would want to cherry pick that for 1.11.2 as per the comments in the linked issue.

/ok-to-test
@kubernetes/sig-cluster-lifecycle-pr-reviews

@neolit123

This comment has been minimized.

Copy link
Member

neolit123 commented Jul 18, 2018

/assign

@runiq
could you please edit the release note to be:

kubeadm: stop setting UID in the kubelet ConfigMap
@neolit123

This comment has been minimized.

Copy link
Member

neolit123 commented Jul 18, 2018

@runiq
please make sure that you run ./hack/update-bazel.sh and include all generate files in your commit.
something else here would be to make sure that unit tests pass and make unit tests changes if needed:

make test WHAT=./cmd/kubeadm/

@runiq runiq changed the title Kubeadm: Stop setting UID in kubelet configmap kubeadm: stop setting UID in the kubelet ConfigMap Jul 19, 2018

@runiq

This comment has been minimized.

Copy link
Contributor Author

runiq commented Jul 19, 2018

please make sure that you run ./hack/update-bazel.sh and include all generate files in your commit.

Done.

something else here would be to make sure that unit tests pass and make unit tests changes if needed

I've run make test WHAT=./cmd/kubeadm, but I'm not sure what to make of the output:

make test WHAT=./cmd/kubeadm/
+++ [0719 10:24:48] Building go targets for linux/amd64:
    ./vendor/k8s.io/code-generator/cmd/deepcopy-gen
2018/07/19 10:24:57 Code for OpenAPI definitions generated
Running tests for APIVersion: v1,admissionregistration.k8s.io/v1alpha1,admissionregistration.k8s.io/v1beta1,admission.k8s.io/v1beta1,apps/v1beta1,apps/v1beta2,apps/v1,authentication.k8s.io/v1,authentication.k8s.io/v1beta1,authorization.k8s.io/v1,authorization.k8s.io/v1beta1,autoscaling/v1,autoscaling/v2beta1,batch/v1,batch/v1beta1,batch/v2alpha1,certificates.k8s.io/v1beta1,coordination.k8s.io/v1beta1,extensions/v1beta1,events.k8s.io/v1beta1,imagepolicy.k8s.io/v1alpha1,networking.k8s.io/v1,policy/v1beta1,rbac.authorization.k8s.io/v1,rbac.authorization.k8s.io/v1beta1,rbac.authorization.k8s.io/v1alpha1,scheduling.k8s.io/v1alpha1,scheduling.k8s.io/v1beta1,settings.k8s.io/v1alpha1,storage.k8s.io/v1beta1,storage.k8s.io/v1,storage.k8s.io/v1alpha1,
+++ [0719 10:24:57] Running tests without code coverage
?       k8s.io/kubernetes/cmd/kubeadm   [no test files]
@neolit123

This comment has been minimized.

Copy link
Member

neolit123 commented Jul 19, 2018

I've run make test WHAT=./cmd/kubeadm, but I'm not sure what to make of the output:

i gave you a wrong command for local tests, but the CI tests passed anyway.
thanks for the change.

/lgtm
/assign @luxas

p.s. cherrypick?

@timothysc
Copy link
Member

timothysc left a comment

/approve

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jul 20, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123, runiq, 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 Jul 20, 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 Jul 20, 2018

Automatic merge from submit-queue (batch tested with PRs 66341, 66405, 66403, 66264, 66447). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 098e971 into kubernetes:master Jul 20, 2018

11 of 18 checks passed

Submit Queue Required Github CI test is not green: pull-kubernetes-e2e-gce
Details
pull-kubernetes-e2e-gce Job triggered.
Details
pull-kubernetes-e2e-gce-100-performance Job triggered.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job triggered.
Details
pull-kubernetes-e2e-kops-aws Job triggered.
Details
pull-kubernetes-kubemark-e2e-gce-big Job triggered.
Details
pull-kubernetes-verify Job triggered.
Details
cla/linuxfoundation runiq authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration 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

@luxas luxas referenced this pull request Jul 21, 2018

Closed

Cherrypick tracking issue for v1.11 #958

8 of 9 tasks complete
@luxas

This comment has been minimized.

Copy link
Member

luxas commented Jul 21, 2018

Thanks @runiq! Can you please submit a cherrypick/backport PR of this to v1.11 as described in kubernetes/kubeadm#958?

@runiq

This comment has been minimized.

Copy link
Contributor Author

runiq commented Jul 23, 2018

Sure, done.

@runiq runiq deleted the runiq:kubeadm-no-uid-in-spec branch Jul 23, 2018

k8s-github-robot pushed a commit that referenced this pull request Jul 24, 2018

Kubernetes Submit Queue
Merge pull request #66495 from runiq/automated-cherry-pick-of-#66341-…
…upstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #66341: kubeadm: stop setting UID in the kubelet ConfigMap

Cherry pick of #66341 on release-1.11.

#66341: kubeadm: stop setting UID in the kubelet ConfigMap
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.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.