Skip to content
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

Merged

Conversation

adohe-zz
Copy link

@adohe-zz adohe-zz commented May 24, 2016

Add "kubectl --overwrite" flag to automatically resolve conflicts between the modified and live configuration using values from the modified configuration.

fixes #17238

This PR just add the --overwrite flag, pkg/strategicpatch has already support overwrite. @bgrant0607 @jackgr ptal.

@k8s-github-robot k8s-github-robot added kind/old-docs size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 24, 2016
@bgrant0607
Copy link
Member

@adohe Thanks, though this needs to wait until after the 1.3 code freeze ends.

@bgrant0607
Copy link
Member

cc @kubernetes/kubectl

@adohe-zz
Copy link
Author

@bgrant0607 it's ok. I just get more time to do kubernete related work and will keep going.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 30, 2016
@bgrant0607 bgrant0607 assigned pwittrock and unassigned bgrant0607 Jun 25, 2016
@pwittrock
Copy link
Member

@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")
Copy link
Member

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.

@pwittrock
Copy link
Member

@k8s-bot test this issue: #IGNORE

Tests hung

@pwittrock
Copy link
Member

@k8s-bot test this issue: #IGNORE

Some infrastructure failure. Lots of tests broken without explanation.

@adohe-zz
Copy link
Author

@pwittrock I just rebase and update this, ptal.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. kind/old-docs size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 18, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 18, 2016

GCE e2e build/test passed for commit ddbd539.

@pwittrock pwittrock added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Jul 18, 2016
@pwittrock
Copy link
Member

@adohe Thanks Tony

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jul 18, 2016

GCE e2e build/test passed for commit ddbd539.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit f50bb73 into kubernetes:master Jul 18, 2016
@adohe-zz adohe-zz deleted the kubectl_apply_overwrite branch July 18, 2016 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kubectl apply --overwrite
8 participants