diff --git a/cmd/kubeadm/app/util/staticpod/utils.go b/cmd/kubeadm/app/util/staticpod/utils.go index 7c58a442ca4..4a403eb5a45 100644 --- a/cmd/kubeadm/app/util/staticpod/utils.go +++ b/cmd/kubeadm/app/util/staticpod/utils.go @@ -372,7 +372,7 @@ func ManifestFilesAreEqual(path1, path2 string) (bool, error) { if bytes.Equal(hash1, hash2) { return true, nil } - klog.V(4).Infof("Pod manifest files diff:\n%s\n", cmp.Diff(pod1, pod2)) + klog.V(4).Infof("Pod manifest files diff:\n%s\n", cmp.Diff(pod2, pod1)) return false, nil } diff --git a/cmd/kubeadm/app/util/staticpod/utils_test.go b/cmd/kubeadm/app/util/staticpod/utils_test.go index 1dd6863e6eb..bb063b4de85 100644 --- a/cmd/kubeadm/app/util/staticpod/utils_test.go +++ b/cmd/kubeadm/app/util/staticpod/utils_test.go @@ -652,6 +652,22 @@ spec: - image: gcr.io/google_containers/etcd-amd64:3.1.11 status: {} ` + invalidWithDefaultFields = ` +apiVersion: v1 +kind: Pod +metadata: + labels: + tier: control-plane + component: etcd + name: etcd + namespace: kube-system +spec: + containers: + - image: gcr.io/google_containers/etcd-amd64:3.1.11 + restartPolicy: "Always" +status: {} +` + validPod2 = ` apiVersion: v1 kind: Pod @@ -749,6 +765,12 @@ func TestManifestFilesAreEqual(t *testing.T) { expectedResult: false, expectErr: false, }, + { + description: "manifests are not equal for adding new defaults", + podYamls: []string{validPod, invalidWithDefaultFields}, + expectedResult: false, + expectErr: false, + }, { description: "first manifest doesn't exist", podYamls: []string{validPod, ""},