mirror of https://github.com/k3s-io/k3s
313f443015
Automatic merge from submit-queue (batch tested with PRs 51323, 59306, 58991, 59050). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix apply --force w/ invalid resource Fixes https://github.com/kubernetes/kubernetes/issues/58984 - First commit: Fixes cases where `--force` is provided with `kubectl apply`, with an object that is BOTH invalid and will cause a conflict error - Second commit: Fixes cases where `--force` is provided with `kubectl apply`, with an invalid object Justification for the first commit here: https://bugzilla.redhat.com/show_bug.cgi?id=1539529#c3 **Release note**: ```release-note NONE ``` cc @ironcladlou |
||
|---|---|---|
| .. | ||
| helpers | ||
| BUILD | ||
| Makefile.manifest | ||
| build.sh | ||
| clean.sh | ||
| cross.sh | ||
| make-help.sh | ||
| test-cmd-util.sh | ||
| test-cmd.sh | ||
| test-e2e-node.sh | ||
| test-integration.sh | ||
| test-kubeadm-cmd.sh | ||
| test.sh | ||
| update.sh | ||
| verify.sh | ||
| vet.sh | ||