Skip to content

Commit b443a84

Browse files
committed
kubeadm: add log for static pod manifest diff
1 parent fba0802 commit b443a84

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

cmd/kubeadm/app/util/staticpod/utils.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@ import (
2929
"strings"
3030
"sync"
3131

32+
"github.com/google/go-cmp/cmp"
3233
"github.com/pkg/errors"
3334

3435
v1 "k8s.io/api/core/v1"
3536
"k8s.io/apimachinery/pkg/api/resource"
3637
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3738
"k8s.io/apimachinery/pkg/util/dump"
3839
"k8s.io/apimachinery/pkg/util/intstr"
40+
"k8s.io/klog/v2"
3941

4042
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
4143
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
@@ -367,8 +369,11 @@ func ManifestFilesAreEqual(path1, path2 string) (bool, error) {
367369
hash1 := hasher.Sum(nil)[0:]
368370
DeepHashObject(hasher, pod2)
369371
hash2 := hasher.Sum(nil)[0:]
370-
371-
return bytes.Equal(hash1, hash2), nil
372+
if bytes.Equal(hash1, hash2) {
373+
return true, nil
374+
}
375+
klog.V(4).Infof("Pod manifest files diff:\n%s\n", cmp.Diff(pod1, pod2))
376+
return false, nil
372377
}
373378

374379
// getProbeAddress returns a valid probe address.

0 commit comments

Comments
 (0)