github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60771 from jennybuckley/kube-up-broken-webhook

Browse Source 
Use semantic equality in client ca post start hook
This commit is contained in:
Kubernetes Prow Robot
2019-04-24 01:24:01 -07:00
committed by GitHub
parent ea38af74a9 d10ee7c874
commit d1e7bb297c
4 changed files with 189 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/master/BUILD
View File

@@ -104,6 +104,7 @@ go_library(
"//staging/src/k8s.io/api/storage/v1:go_default_library",
"//staging/src/k8s.io/api/storage/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/storage/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",

4
pkg/master/client_ca_hook.go
View File

@@ -19,10 +19,10 @@ package master
import (
"encoding/json"
"fmt"
"reflect"
"time"
corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -132,7 +132,7 @@ func writeConfigMap(client corev1client.ConfigMapsGetter, name string, data map[
return err
}
if !reflect.DeepEqual(existing.Data, data) {
if !apiequality.Semantic.DeepEqual(existing.Data, data) {
existing.Data = data
_, err = client.ConfigMaps(metav1.NamespaceSystem).Update(existing)
}