github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120541 from pacoxu/kubeadm-fix-hash

Browse Source 
kubeadm: add log for static pod manifest diff
This commit is contained in:
Kubernetes Prow Robot 2023-09-09 06:08:08 -07:00 committed by GitHub
commit fd8f2c7fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/util/staticpod/utils.go
View File

@ -29,6 +29,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/google/go-cmp/cmp"
"github.com/pkg/errors" "github.com/pkg/errors"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
@ -36,6 +37,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/dump" "k8s.io/apimachinery/pkg/util/dump"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/klog/v2"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
@ -367,8 +369,11 @@ func ManifestFilesAreEqual(path1, path2 string) (bool, error) {
hash1 := hasher.Sum(nil)[0:] hash1 := hasher.Sum(nil)[0:]
DeepHashObject(hasher, pod2) DeepHashObject(hasher, pod2)
hash2 := hasher.Sum(nil)[0:] hash2 := hasher.Sum(nil)[0:]
if bytes.Equal(hash1, hash2) {
return bytes.Equal(hash1, hash2), nil 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. // getProbeAddress returns a valid probe address.