github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74018 from JoeWrightss/patch-1

Browse Source 
remove redundant words 'the' in comment
This commit is contained in:
Kubernetes Prow Robot 2019-06-13 19:12:32 -07:00 committed by GitHub
commit a52e08a2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go
View File

@ -131,8 +131,8 @@ func decodeVersionedSet(encodedVersionedSet *metav1.ManagedFieldsEntry) (version
return versionedSet, nil return versionedSet, nil
} }
// encodeManagedFields converts ManagedFields from the the format used by // encodeManagedFields converts ManagedFields from the format used by
// sigs.k8s.io/structured-merge-diff to the the wire format (api format) // sigs.k8s.io/structured-merge-diff to the wire format (api format)
func encodeManagedFields(managedFields fieldpath.ManagedFields) (encodedManagedFields []metav1.ManagedFieldsEntry, err error) { func encodeManagedFields(managedFields fieldpath.ManagedFields) (encodedManagedFields []metav1.ManagedFieldsEntry, err error) {
// Sort the keys so a predictable order will be used. // Sort the keys so a predictable order will be used.
managers := []string{} managers := []string{}

8
staging/src/k8s.io/client-go/tools/leaderelection/healthzadaptor_test.go
View File

@ -76,7 +76,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
elector: nil, elector: nil,
}, },
{ {
description: "call check when the the lease is far expired", description: "call check when the lease is far expired",
expected: fmt.Errorf("failed election to renew leadership on lease %s", "foo"), expected: fmt.Errorf("failed election to renew leadership on lease %s", "foo"),
adaptorTimeout: time.Second * 20, adaptorTimeout: time.Second * 20,
elector: &LeaderElector{ elector: &LeaderElector{
@ -93,7 +93,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
}, },
}, },
{ {
description: "call check when the the lease is far expired but held by another server", description: "call check when the lease is far expired but held by another server",
expected: nil, expected: nil,
adaptorTimeout: time.Second * 20, adaptorTimeout: time.Second * 20,
elector: &LeaderElector{ elector: &LeaderElector{
@ -110,7 +110,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
}, },
}, },
{ {
description: "call check when the the lease is not expired", description: "call check when the lease is not expired",
expected: nil, expected: nil,
adaptorTimeout: time.Second * 20, adaptorTimeout: time.Second * 20,
elector: &LeaderElector{ elector: &LeaderElector{
@ -127,7 +127,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
}, },
}, },
{ {
description: "call check when the the lease is expired but inside the timeout", description: "call check when the lease is expired but inside the timeout",
expected: nil, expected: nil,
adaptorTimeout: time.Second * 20, adaptorTimeout: time.Second * 20,
elector: &LeaderElector{ elector: &LeaderElector{