-
Notifications
You must be signed in to change notification settings - Fork 40k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
kubectl apply add --overwrite flag #26136
kubectl apply add --overwrite flag #26136
Conversation
@adohe Thanks, though this needs to wait until after the 1.3 code freeze ends. |
cc @kubernetes/kubectl |
@bgrant0607 it's ok. I just get more time to do kubernete related work and will keep going. |
@johndmulhausen What is the process for updating the docs repo with changes from generated files? Is there a script for this? |
@@ -69,6 +69,7 @@ func NewCmdApply(f *cmdutil.Factory, out io.Writer) *cobra.Command { | |||
usage := "Filename, directory, or URL to file that contains the configuration to apply" | |||
kubectl.AddJsonFilenameFlag(cmd, &options.Filenames, usage) | |||
cmd.MarkFlagRequired("filename") | |||
cmd.Flags().Bool("overwrite", true, "Ignore conflicts between modified and current configuration") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please clarify what ignoring means in this help text. Maybe Automatically resolve conflicts between the modified and live configurations by using values from the modified configuration.
@k8s-bot test this issue: #IGNORE Tests hung |
@k8s-bot test this issue: #IGNORE Some infrastructure failure. Lots of tests broken without explanation. |
45ea2dd
to
ddbd539
Compare
@pwittrock I just rebase and update this, ptal. |
GCE e2e build/test passed for commit ddbd539. |
@adohe Thanks Tony |
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
GCE e2e build/test passed for commit ddbd539. |
Automatic merge from submit-queue |
fixes #17238
This PR just add the
--overwrite
flag, pkg/strategicpatch has already support overwrite. @bgrant0607 @jackgr ptal.