mirror of
https://github.com/kubernetes/client-go.git
synced 2025-06-29 08:29:23 +00:00
Merge pull request #127466 from guozheng-shen/fix-return
endpointsLeasesResourceLock and configMapsLeasesResourceLock has been removed Kubernetes-commit: 36bbdd692f6df76710d9568aebf9778f34dc7061
This commit is contained in:
commit
d79bc2831e
@ -35,73 +35,7 @@ const (
|
|||||||
endpointsResourceLock = "endpoints"
|
endpointsResourceLock = "endpoints"
|
||||||
configMapsResourceLock = "configmaps"
|
configMapsResourceLock = "configmaps"
|
||||||
LeasesResourceLock = "leases"
|
LeasesResourceLock = "leases"
|
||||||
// When using endpointsLeasesResourceLock, you need to ensure that
|
|
||||||
// API Priority & Fairness is configured with non-default flow-schema
|
|
||||||
// that will catch the necessary operations on leader-election related
|
|
||||||
// endpoint objects.
|
|
||||||
//
|
|
||||||
// The example of such flow scheme could look like this:
|
|
||||||
// apiVersion: flowcontrol.apiserver.k8s.io/v1beta2
|
|
||||||
// kind: FlowSchema
|
|
||||||
// metadata:
|
|
||||||
// name: my-leader-election
|
|
||||||
// spec:
|
|
||||||
// distinguisherMethod:
|
|
||||||
// type: ByUser
|
|
||||||
// matchingPrecedence: 200
|
|
||||||
// priorityLevelConfiguration:
|
|
||||||
// name: leader-election # reference the <leader-election> PL
|
|
||||||
// rules:
|
|
||||||
// - resourceRules:
|
|
||||||
// - apiGroups:
|
|
||||||
// - ""
|
|
||||||
// namespaces:
|
|
||||||
// - '*'
|
|
||||||
// resources:
|
|
||||||
// - endpoints
|
|
||||||
// verbs:
|
|
||||||
// - get
|
|
||||||
// - create
|
|
||||||
// - update
|
|
||||||
// subjects:
|
|
||||||
// - kind: ServiceAccount
|
|
||||||
// serviceAccount:
|
|
||||||
// name: '*'
|
|
||||||
// namespace: kube-system
|
|
||||||
endpointsLeasesResourceLock = "endpointsleases"
|
endpointsLeasesResourceLock = "endpointsleases"
|
||||||
// When using configMapsLeasesResourceLock, you need to ensure that
|
|
||||||
// API Priority & Fairness is configured with non-default flow-schema
|
|
||||||
// that will catch the necessary operations on leader-election related
|
|
||||||
// configmap objects.
|
|
||||||
//
|
|
||||||
// The example of such flow scheme could look like this:
|
|
||||||
// apiVersion: flowcontrol.apiserver.k8s.io/v1beta2
|
|
||||||
// kind: FlowSchema
|
|
||||||
// metadata:
|
|
||||||
// name: my-leader-election
|
|
||||||
// spec:
|
|
||||||
// distinguisherMethod:
|
|
||||||
// type: ByUser
|
|
||||||
// matchingPrecedence: 200
|
|
||||||
// priorityLevelConfiguration:
|
|
||||||
// name: leader-election # reference the <leader-election> PL
|
|
||||||
// rules:
|
|
||||||
// - resourceRules:
|
|
||||||
// - apiGroups:
|
|
||||||
// - ""
|
|
||||||
// namespaces:
|
|
||||||
// - '*'
|
|
||||||
// resources:
|
|
||||||
// - configmaps
|
|
||||||
// verbs:
|
|
||||||
// - get
|
|
||||||
// - create
|
|
||||||
// - update
|
|
||||||
// subjects:
|
|
||||||
// - kind: ServiceAccount
|
|
||||||
// serviceAccount:
|
|
||||||
// name: '*'
|
|
||||||
// namespace: kube-system
|
|
||||||
configMapsLeasesResourceLock = "configmapsleases"
|
configMapsLeasesResourceLock = "configmapsleases"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -177,9 +111,9 @@ func New(lockType string, ns string, name string, coreClient corev1.CoreV1Interf
|
|||||||
}
|
}
|
||||||
switch lockType {
|
switch lockType {
|
||||||
case endpointsResourceLock:
|
case endpointsResourceLock:
|
||||||
return nil, fmt.Errorf("endpoints lock is removed, migrate to %s (using version v0.27.x)", endpointsLeasesResourceLock)
|
return nil, fmt.Errorf("endpoints lock is removed, migrate to %s", LeasesResourceLock)
|
||||||
case configMapsResourceLock:
|
case configMapsResourceLock:
|
||||||
return nil, fmt.Errorf("configmaps lock is removed, migrate to %s (using version v0.27.x)", configMapsLeasesResourceLock)
|
return nil, fmt.Errorf("configmaps lock is removed, migrate to %s", LeasesResourceLock)
|
||||||
case LeasesResourceLock:
|
case LeasesResourceLock:
|
||||||
return leaseLock, nil
|
return leaseLock, nil
|
||||||
case endpointsLeasesResourceLock:
|
case endpointsLeasesResourceLock:
|
||||||
|
Loading…
Reference in New Issue
Block a user