Allow kcm and scheduler to lock on ConfigMaps. #45739

timothysc · 2017-05-12T18:14:38Z

What this PR does / why we need it:
Plumbs through the ability to lock on ConfigMaps through the kcm and scheduler.

Which issue this PR fixes
Fixes: #44857
Addresses issues with: #45415

Special notes for your reviewer:

Release note:

Add leader-election-resource-lock support to kcm and scheduler to allow for locking on ConfigMaps as well as Endpoints(default)

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews @jamiehannaford @bsalamat @mikedanese

jamiehannaford

Is it also possible to cherry pick my commit and add in your new fn signature? It's very similar to what I originally submitted :)

jamiehannaford · 2017-05-12T18:27:16Z

pkg/client/leaderelection/resourcelock/interface.go

@@ -69,3 +74,29 @@ type Interface interface {
 	// into a string
 	Describe() string
 }
+
+// Manufacture will create a lock of a given type according to the input parameters
+func Manufacture(lockType string, ns string, name string, client *cs.Clientset, rlc ResourceLockConfig) (Interface, error) {


ns, name string

Why not just call this New? What is the significance of Manufacture in this context?

New works for me.

timothysc · 2017-05-12T18:44:18Z

Is it also possible to cherry pick my commit and add in your new fn signature? It's very similar to what I originally submitted

Yes, Done.

mikedanese · 2017-05-12T22:29:37Z

pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go

@@ -814,6 +814,7 @@ func autoConvert_v1alpha1_LeaderElectionConfiguration_To_componentconfig_LeaderE
 	out.LeaseDuration = in.LeaseDuration
 	out.RenewDeadline = in.RenewDeadline
 	out.RetryPeriod = in.RetryPeriod
+	out.LockType = in.LockType


Technically, "endpoints" and "configmaps" are Kinds in our API. Types also include a version.

I'm fine with changing the name.

LockKind (sounds weird)

ResourceLock

LockType

... I don't really care. Do you have preferences @mikedanese ?

I would prefer LockResource. It also needs to be a group and resource, not just one or the other. You probably don't want to perform discovery, so I'd recommend doing LockResource and LockResourceGroup or similar.

endpoints is a resource (addressable via the API) and is what most external components should use. Kind (Endpoints) is a schema, and multiple resources can have that schema.

We're gradually phasing out use of GroupVersionKind in internal code, but it will take a while.

I was making this switch in openshift the other day and used:

https://github.com/openshift/origin/pull/14094/files#diff-3788994f990386b63387ece5c3b5dc33R1418 for the componentconfig equivalent and https://github.com/openshift/origin/pull/14094/files#diff-9eadaa7b7aac3bc9ea7ed27cb8908d52R86 for the CLI flag equivalent.

I'll change the name to LockResource.

Re: grouping, that's done a layer above and passed into the Manufacture/New function, which keeps the library generic enough for general reuse.

That said, if we want to build it around the api w/Group, I think we could follow on with a separate PR.

LockResource SGTM

…pes.

timothysc · 2017-05-15T16:30:20Z

@k8s-bot gce etcd3 e2e test this

timothysc · 2017-05-15T16:56:45Z

@mikedanese I believe I've addressed the comments, PTAL.

mikedanese · 2017-05-15T17:18:59Z

/lgtm

k8s-github-robot · 2017-05-15T17:19:09Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mikedanese, timothysc
We suggest the following additional approvers: davidopp, pwittrock

Assign the PR to them by writing /assign @davidopp @pwittrock in a comment when ready.

Needs approval from an approver in each of these OWNERS Files:

~~cmd/kube-controller-manager/OWNERS~~ [mikedanese]
hack/verify-flags/OWNERS
~~pkg/apis/componentconfig/OWNERS~~ [mikedanese]
~~pkg/client/leaderelection/OWNERS~~ [mikedanese,timothysc]
plugin/cmd/kube-scheduler/OWNERS

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

ravilr · 2017-05-15T21:17:19Z

@timothysc @deads2k the default system:.. rbac bootstrap policies for controller-manager and scheduler also needs update to allow create/update/delete on configmap resource here?

timothysc · 2017-05-15T21:49:51Z

@ravilr - Do we not have RBAC on any of our e2es?

mikedanese · 2017-05-15T22:07:12Z

Should be on in all e2e tests. You can add the policy here:
https://github.com/kubernetes/kubernetes/blob/master/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go#L299

timothysc · 2017-05-15T22:08:17Z

Meh, I'll fix up this PR.

timothysc · 2017-05-16T18:16:10Z

So the other change hits a different space, so I'm going to push this one through and follow up with a RBAC PR.

k8s-github-robot · 2017-05-17T01:10:56Z

Automatic merge from submit-queue (batch tested with PRs 45374, 44537, 45739, 44474, 45888)

Automatic merge from submit-queue (batch tested with PRs 45269, 46219, 45966) Update RBAC policy for configmap locked leader leasing. **What this PR does / why we need it**: Updates the bootstrap policy to allow for configmap get/update/list/watch for leader leasing. **Which issue this PR fixes** Follow on PR from: #45739 xref: #44857 **Special notes for your reviewer**: **Release note**: ``` NONE ``` /cc @kubernetes/sig-auth-pr-reviews

timothysc added area/HA kind/enhancement sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels May 12, 2017

timothysc added this to the v1.7 milestone May 12, 2017

timothysc assigned mikedanese May 12, 2017

timothysc requested review from mikedanese and bsalamat May 12, 2017 18:14

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels May 12, 2017

jamiehannaford suggested changes May 12, 2017

View reviewed changes

timothysc force-pushed the cm_lock branch from 88fb254 to a7638fe Compare May 12, 2017 19:19

timothysc mentioned this pull request May 12, 2017

Kubeadm HA ( high availability ) checklist kubernetes/kubeadm#261

Closed

10 tasks

mikedanese reviewed May 12, 2017

View reviewed changes

Jamie Hannaford and others added 3 commits May 15, 2017 08:42

Add lock type flags for controller-manager leadership election

a2248a2

Update to plumb through configurable locking on different resource ty…

1173c84

…pes.

Update generated

2033ea6

timothysc force-pushed the cm_lock branch from a7638fe to 2033ea6 Compare May 15, 2017 15:02

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

timothysc added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2017

timothysc added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 15, 2017

k8s-github-robot merged commit 7f92d35 into kubernetes:master May 17, 2017

timothysc mentioned this pull request May 17, 2017

Update RBAC policy for configmap locked leader leasing. #45966

Merged

liggitt mentioned this pull request Jan 22, 2018

master leader election shouldn't consume O(nodes) watch bandwidth #34627

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow kcm and scheduler to lock on ConfigMaps. #45739

Allow kcm and scheduler to lock on ConfigMaps. #45739

timothysc commented May 12, 2017 •

edited

Loading

jamiehannaford left a comment

jamiehannaford May 12, 2017

mikedanese May 12, 2017

timothysc May 12, 2017

timothysc commented May 12, 2017 •

edited

Loading

mikedanese May 12, 2017

timothysc May 12, 2017 •

edited

Loading

smarterclayton May 14, 2017

smarterclayton May 14, 2017

smarterclayton May 14, 2017

smarterclayton May 14, 2017

timothysc May 15, 2017 •

edited

Loading

mikedanese May 15, 2017

timothysc commented May 15, 2017

timothysc commented May 15, 2017

mikedanese commented May 15, 2017

k8s-github-robot commented May 15, 2017

ravilr commented May 15, 2017

timothysc commented May 15, 2017

mikedanese commented May 15, 2017

timothysc commented May 15, 2017 •

edited

Loading

timothysc commented May 16, 2017

k8s-github-robot commented May 17, 2017

Allow kcm and scheduler to lock on ConfigMaps. #45739

Allow kcm and scheduler to lock on ConfigMaps. #45739

Conversation

timothysc commented May 12, 2017 • edited Loading

jamiehannaford left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

timothysc commented May 12, 2017 • edited Loading

Choose a reason for hiding this comment

timothysc May 12, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

timothysc May 15, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

timothysc commented May 15, 2017

timothysc commented May 15, 2017

mikedanese commented May 15, 2017

k8s-github-robot commented May 15, 2017

ravilr commented May 15, 2017

timothysc commented May 15, 2017

mikedanese commented May 15, 2017

timothysc commented May 15, 2017 • edited Loading

timothysc commented May 16, 2017

k8s-github-robot commented May 17, 2017

timothysc commented May 12, 2017 •

edited

Loading

timothysc commented May 12, 2017 •

edited

Loading

timothysc May 12, 2017 •

edited

Loading

timothysc May 15, 2017 •

edited

Loading

timothysc commented May 15, 2017 •

edited

Loading