github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94380 from julianvmodesto/update-diff-csa-to-ssa-test

Browse Source 
Ensure `kubectl diff --server-side` does not conflict with client-side apply
This commit is contained in:
Kubernetes Prow Robot 2020-09-16 01:25:20 -07:00 committed by GitHub
commit 0a02eda2a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/cmd/diff.sh
View File

@ -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