diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go index 884645c5efc..741918fdda4 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go @@ -131,8 +131,8 @@ func decodeVersionedSet(encodedVersionedSet *metav1.ManagedFieldsEntry) (version return versionedSet, nil } -// encodeManagedFields converts ManagedFields from the the format used by -// sigs.k8s.io/structured-merge-diff to the the wire format (api format) +// encodeManagedFields converts ManagedFields from the format used by +// sigs.k8s.io/structured-merge-diff to the wire format (api format) func encodeManagedFields(managedFields fieldpath.ManagedFields) (encodedManagedFields []metav1.ManagedFieldsEntry, err error) { // Sort the keys so a predictable order will be used. managers := []string{} diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/healthzadaptor_test.go b/staging/src/k8s.io/client-go/tools/leaderelection/healthzadaptor_test.go index 746d49130c4..8226c3cf938 100644 --- a/staging/src/k8s.io/client-go/tools/leaderelection/healthzadaptor_test.go +++ b/staging/src/k8s.io/client-go/tools/leaderelection/healthzadaptor_test.go @@ -76,7 +76,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) { 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"), adaptorTimeout: time.Second * 20, 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, adaptorTimeout: time.Second * 20, 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, adaptorTimeout: time.Second * 20, 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, adaptorTimeout: time.Second * 20, elector: &LeaderElector{