mirror of https://github.com/k3s-io/k3s
fac05d9c81
Automatic merge from submit-queue V2resource fixes when using kubectl set resources it resets all resource fields that are not being set. for example $ kubectl set resources deployments nginx --limits=cpu=100m followed by $ kubectl set resources deployments nginx --limits=memory=256Mi would result in the nginx deployment only limiting memory at 256Mi with the previous limit placed on the cpu being wiped out. This behavior is corrected so that each invocation only modifies fields set in that command and changed the testing so that the desired behavior is checked. Also a typo: you must specify an update to requests or limits or (in the form of --requests/--limits) corrected to you must specify an update to requests or limits (in the form of --requests/--limits) Implemented both the dry run and local flags. Added test cases to show that both flags are operating as intended. Removed the print statement "running in local mode" as in PR#35112 The original PR associated with these fixes where reverted due to causing a flake in hack/make-rules/test-cmd.sh, I gave the 'kubectl set resources' tests there own deployment and set the terminationGracePeriodSeconds to 0 and have run test-cmd.sh for hours without hitting the flake |
||
|---|---|---|
| .. | ||
| filter | ||
| prune | ||
| prune-reap | ||
| recursive | ||
| csr.yml | ||
| deployment-multicontainer-resources.yaml | ||
| deployment-multicontainer.yaml | ||
| deployment-revision1.yaml | ||
| deployment-revision2.yaml | ||
| frontend-controller.yaml | ||
| frontend-replicaset.yaml | ||
| invalid-rc-with-empty-args.yaml | ||
| list.yaml | ||
| multi-resource-json-modify.json | ||
| multi-resource-json.json | ||
| multi-resource-list-modify.json | ||
| multi-resource-list.json | ||
| multi-resource-rclist-modify.json | ||
| multi-resource-rclist.json | ||
| multi-resource-svclist-modify.json | ||
| multi-resource-svclist.json | ||
| multi-resource-yaml-modify.yaml | ||
| multi-resource-yaml.yaml | ||
| nginx-statefulset.yaml | ||
| pod-apply.yaml | ||
| pod-with-api-env.yaml | ||
| pod-with-large-name.yaml | ||
| pod-with-precision.json | ||
| pod.yaml | ||
| redis-slave-replicaset.yaml | ||
| tls.crt | ||
| tls.key | ||