From b443a841e30dbbb7e9eb9245e6d31065e2eea3b8 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Sat, 9 Sep 2023 19:51:26 +0800 Subject: [PATCH] kubeadm: add log for static pod manifest diff --- cmd/kubeadm/app/util/staticpod/utils.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/util/staticpod/utils.go b/cmd/kubeadm/app/util/staticpod/utils.go index eae22677477..7c58a442ca4 100644 --- a/cmd/kubeadm/app/util/staticpod/utils.go +++ b/cmd/kubeadm/app/util/staticpod/utils.go @@ -29,6 +29,7 @@ import ( "strings" "sync" + "github.com/google/go-cmp/cmp" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" @@ -36,6 +37,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/dump" "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/klog/v2" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -367,8 +369,11 @@ func ManifestFilesAreEqual(path1, path2 string) (bool, error) { hash1 := hasher.Sum(nil)[0:] DeepHashObject(hasher, pod2) hash2 := hasher.Sum(nil)[0:] - - return bytes.Equal(hash1, hash2), nil + if bytes.Equal(hash1, hash2) { + return true, nil + } + klog.V(4).Infof("Pod manifest files diff:\n%s\n", cmp.Diff(pod1, pod2)) + return false, nil } // getProbeAddress returns a valid probe address.