Skip to content

K
k3s
Commit 33eb8794 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43499 from liggitt/kubectl-replace-flake

Automatic merge from submit-queue (batch tested with PRs 43513, 43499) Make kubectl replace unconditional second attempt at https://github.com/kubernetes/kubernetes/pull/43192 rather than a retry, make the replace unconditional, which works reliably
parents 833ff4f6 db52b4eb
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
hack/make-rules/test-cmd-util.sh
View file @ 33eb8794
...@@ -666,14 +666,17 @@ run_pod_tests() { ...@@ -666,14 +666,17 @@ run_pod_tests() {
} }
} }
__EOF__ __EOF__
kubectl-with-retry replace "${kube_flags[@]}" -f <(echo '{ kubectl replace -f - "${kube_flags[@]}" << __EOF__
{
"kind": "Node", "kind": "Node",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "node-v1-test", "name": "node-v1-test",
"annotations": {"a":"b"} "annotations": {"a":"b"},
"resourceVersion": "0"
} }
}') }
__EOF__
# Post-condition: the node command succeeds # Post-condition: the node command succeeds
kube::test::get_object_assert "node node-v1-test" "{{.metadata.annotations.a}}" 'b' kube::test::get_object_assert "node node-v1-test" "{{.metadata.annotations.a}}" 'b'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment