Skip to content

K
k3s
Unverified Commit 6be660a8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60055 from mattkelly/fix-configmaplock-typos

Automatic merge from submit-queue (batch tested with PRs 60158, 60156, 58111, 57583, 60055). 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 typos in configmaplock **What this PR does / why we need it**: Fixes some typos in `configmaplock.go`. Seems to be a combination of copy/paste errors from `endpointslock.go` and find/replace gone wrong. **Release note**: ```release-note NONE ```
parents 714b19ee b2342ae9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go
View file @ 6be660a8
...@@ -32,15 +32,15 @@ import ( ...@@ -32,15 +32,15 @@ import (
// data we will likely move to deprecate the Endpoints lock. // data we will likely move to deprecate the Endpoints lock.
type ConfigMapLock struct { type ConfigMapLock struct {
// ConfigMapMeta should contain a Name and a Namespace of an // ConfigMapMeta should contain a Name and a Namespace of a
// ConfigMapMeta object that the Leadercmlector will attempt to lead. // ConfigMapMeta object that the LeaderElector will attempt to lead.
ConfigMapMeta metav1.ObjectMeta ConfigMapMeta metav1.ObjectMeta
Client corev1client.ConfigMapsGetter Client corev1client.ConfigMapsGetter
LockConfig ResourceLockConfig LockConfig ResourceLockConfig
cm *v1.ConfigMap cm *v1.ConfigMap
} }
// Get returns the cmlection record from a ConfigMap Annotation // Get returns the election record from a ConfigMap Annotation
func (cml *ConfigMapLock) Get() (*LeaderElectionRecord, error) { func (cml *ConfigMapLock) Get() (*LeaderElectionRecord, error) {
var record LeaderElectionRecord var record LeaderElectionRecord
var err error var err error
...@@ -59,7 +59,7 @@ func (cml *ConfigMapLock) Get() (*LeaderElectionRecord, error) { ...@@ -59,7 +59,7 @@ func (cml *ConfigMapLock) Get() (*LeaderElectionRecord, error) {
return &record, nil return &record, nil
} }
// Create attempts to create a LeadercmlectionRecord annotation // Create attempts to create a LeaderElectionRecord annotation
func (cml *ConfigMapLock) Create(ler LeaderElectionRecord) error { func (cml *ConfigMapLock) Create(ler LeaderElectionRecord) error {
recordBytes, err := json.Marshal(ler) recordBytes, err := json.Marshal(ler)
if err != nil { if err != nil {
...@@ -77,7 +77,7 @@ func (cml *ConfigMapLock) Create(ler LeaderElectionRecord) error { ...@@ -77,7 +77,7 @@ func (cml *ConfigMapLock) Create(ler LeaderElectionRecord) error {
return err return err
} }
// Update will update and existing annotation on a given resource. // Update will update an existing annotation on a given resource.
func (cml *ConfigMapLock) Update(ler LeaderElectionRecord) error { func (cml *ConfigMapLock) Update(ler LeaderElectionRecord) error {
if cml.cm == nil { if cml.cm == nil {
return errors.New("endpoint not initialized, call get or create first") return errors.New("endpoint not initialized, call get or create first")
...@@ -91,7 +91,7 @@ func (cml *ConfigMapLock) Update(ler LeaderElectionRecord) error { ...@@ -91,7 +91,7 @@ func (cml *ConfigMapLock) Update(ler LeaderElectionRecord) error {
return err return err
} }
// RecordEvent in leader cmlection while adding meta-data // RecordEvent in leader election while adding meta-data
func (cml *ConfigMapLock) RecordEvent(s string) { func (cml *ConfigMapLock) RecordEvent(s string) {
events := fmt.Sprintf("%v %v", cml.LockConfig.Identity, s) events := fmt.Sprintf("%v %v", cml.LockConfig.Identity, s)
cml.LockConfig.EventRecorder.Eventf(&v1.ConfigMap{ObjectMeta: cml.cm.ObjectMeta}, v1.EventTypeNormal, "LeaderElection", events) cml.LockConfig.EventRecorder.Eventf(&v1.ConfigMap{ObjectMeta: cml.cm.ObjectMeta}, v1.EventTypeNormal, "LeaderElection", events)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment