github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set kubectl field manager names

Browse Source
This commit is contained in:
Julian V. Modesto
2020-03-04 22:04:01 -05:00
parent c1fe194e06
commit 360c348d0e
46 changed files with 287 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/cmd/diff.sh
View File

@@ -54,7 +54,6 @@ run_kubectl_diff_tests() {
kube::test::if_has_string "${resourceVersion}" "${initialResourceVersion}"
# Test found diff with server-side apply
kubectl apply -f hack/testdata/pod.yaml
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side --force-conflicts || test $? -eq 1)
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
@@ -65,6 +64,31 @@ run_kubectl_diff_tests() {
# Test that we have a return code bigger than 1 if there is an error when diffing
kubectl diff -f hack/testdata/invalid-pod.yaml || test $? -gt 1
# Cleanup
kubectl delete -f hack/testdata/pod.yaml
kube::log::status "Testing kubectl diff with server-side apply"
# Test that kubectl diff --server-side works when the live object doesn't exist
output_message=$(! kubectl diff --server-side -f hack/testdata/pod.yaml)
kube::test::if_has_string "${output_message}" 'test-pod'
# Ensure diff --server-side only dry-runs and doesn't persist change
kube::test::get_object_assert 'pod' "{{range.items}}{{ if eq ${id_field:?} \\\"test-pod\\\" }}found{{end}}{{end}}:" ':'
# Server-side apply the Pod
kubectl apply --server-side -f hack/testdata/pod.yaml
kube::test::get_object_assert 'pod' "{{range.items}}{{ if eq ${id_field:?} \\\"test-pod\\\" }}found{{end}}{{end}}:" 'found:'
# Make sure that --server-side diffing the resource right after returns nothing (0 exit code).
kubectl diff --server-side -f hack/testdata/pod.yaml
# Make sure that for kubectl diff --server-side:
# 1. the exit code for diff is 1 because it found a difference
# 2. the difference contains the changed image
output_message=$(kubectl diff --server-side -f hack/testdata/pod-changed.yaml || test $? -eq 1)
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
# Cleanup
kubectl delete -f hack/testdata/pod.yaml
set +o nounset