From 234fbfa63a0785678f213e3d9742e124082a7f6b Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Tue, 23 Apr 2019 12:46:58 -0700 Subject: [PATCH] Use semantic equality in client ca post start hook --- pkg/master/BUILD | 1 + pkg/master/client_ca_hook.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/master/BUILD b/pkg/master/BUILD index c46d692a45b..ea530b5af0a 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -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", diff --git a/pkg/master/client_ca_hook.go b/pkg/master/client_ca_hook.go index e8a52dd9951..07de81d9568 100644 --- a/pkg/master/client_ca_hook.go +++ b/pkg/master/client_ca_hook.go @@ -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) }