From 690c6b2f2505a455570a30cc8dc0312aee283e07 Mon Sep 17 00:00:00 2001 From: "Julian V. Modesto" Date: Mon, 31 Aug 2020 15:46:35 -0400 Subject: [PATCH] Update `kubectl diff --server-side` test. In 1.19, we made it so that upgrading from client-side `kubectl apply` to server-side `kubectl apply --server-side` does not conflict. This means that `kubectl diff --server-side` should work the same: server-side apply diffing a resource managed originally with client-side apply should not result in conflicts. --- test/cmd/diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cmd/diff.sh b/test/cmd/diff.sh index 11a47689b5d..4894e62b1c8 100755 --- a/test/cmd/diff.sh +++ b/test/cmd/diff.sh @@ -54,7 +54,7 @@ run_kubectl_diff_tests() { kube::test::if_has_string "${resourceVersion}" "${initialResourceVersion}" # Test found diff with server-side apply - output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side --force-conflicts || test $? -eq 1) + output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side || test $? -eq 1) kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0' # Ensure diff --server-side only dry-runs and doesn't persist change