Add the kubectl apply command #14621

jackgr · 2015-09-27T07:00:39Z

This pull request adds the kubectl apply command. It does not yet create configuration annotations automatically when configuration is updated through other code paths. However, it does create them when it applies new configurations, so two or more invocations of kubectl apply will bootstrap them.

The next and final step in implementing #1702 will be automatically creating configuration annotations when configuration is updated through other code paths.

jackgr · 2015-09-27T07:02:28Z

Note that this pull request depends on and by necessity includes #13820, which adds the method to create the three way merge patch used by kubectl apply. When #13820 is merged, the diff for this pull request will be significantly smaller.

k8s-bot · 2015-09-27T07:33:28Z

Unit, integration and GCE e2e test build/test passed for commit 9aa318241bf6d701114b25d9d49462f363ffcba6.

k8s-github-robot · 2015-09-27T07:49:10Z

Labelling this PR as size/XXL

jackgr · 2015-09-27T17:22:55Z

cc @bgrant0607, @ghodss, @mikedanese

k8s-bot · 2015-09-27T17:55:20Z

Unit, integration and GCE e2e build/test failed for commit 91adc9bcfb77484be336c9efaea473a8c8baf982.

bgrant0607 · 2015-09-27T21:41:02Z

cc @kubernetes/kubectl

bgrant0607 · 2015-09-27T21:46:22Z

pkg/kubectl/cmd/apply.go

+
+# Apply the JSON passed into stdin to a pod.
+$ cat pod.json | kubectl apply -f -`
+	apply_annotation = "k8s-kubectl-apply"


https://github.com/kubernetes/kubernetes/blob/master/docs/devel/api-conventions.md#label-selector-and-annotation-conventions

Use something like kubectl.kubernetes.io/config

See also the annotations used by rolling update:
https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/rolling_updater.go#L38

kubernetes/pkg/kubectl/kubectl.go

Line 27 in 77a06cb

const kubectlAnnotationPrefix = "kubectl.kubernetes.io/"

bgrant0607 · 2015-09-27T21:47:10Z

Will need an e2e test.

k8s-bot · 2015-09-28T23:21:17Z

Unit, integration and GCE e2e test build/test passed for commit e4053d297cc440d439242e7cf07ab550fa5b5226.

k8s-bot · 2015-09-28T23:51:27Z

Unit, integration and GCE e2e build/test failed for commit 1b50c0538170e52af97404ad773b4b132e80296d.

k8s-bot · 2015-09-29T00:14:13Z

Unit, integration and GCE e2e test build/test passed for commit 5f2c43fc85f0bcad352145c7541fabe253ea778b.

k8s-bot · 2015-09-30T23:30:42Z

Unit, integration and GCE e2e test build/test passed for commit 31c8d47b1fbb515828ac0d4e4327d3470a6a9250.

k8s-bot · 2015-10-01T00:19:35Z

Unit, integration and GCE e2e build/test failed for commit 62e6c7f2c9c6af97a8761d180b9449e9269d7aaf.

k8s-bot · 2015-10-01T00:50:24Z

Unit, integration and GCE e2e build/test failed for commit e1914c4a57fd45ee00cc32a87436ae3c42613735.

jackgr · 2015-10-02T22:45:43Z

@jlowdermilk Done. PTAL.

k8s-bot · 2015-10-02T22:47:31Z

Unit, integration and GCE e2e test build/test passed for commit aa686d31c19642844d29bb59cdefa8e70246761e.

k8s-bot · 2015-10-02T22:56:09Z

Unit, integration and GCE e2e test build/test passed for commit 3984e416c1d1f875199e56423b9afad32be337a0.

j3ffml · 2015-10-02T23:10:52Z

pkg/kubectl/cmd/apply.go

+		NamespaceParam(cmdNamespace).DefaultNamespace().
+		FilenameParam(enforceNamespace, options.Filenames...).
+		Flatten().
+		Latest().


Remove Latest() here. The reason is that the resource builder will overwrite info.Object when you call Visit with the latest version from server. You want to save/serialize the object as loaded from file before you get the latest version of the object in order to do a 3-way patch. See suggested changes below.

This code works correctly as currently written. Without Latest(), it did not fetch from the server. With Latest(), it does, but does not overwrite the Versioned Object, which is what we use to diff against the annotation. I'd like to better understand what you're asking for before changing anything.

k8s-bot · 2015-10-02T23:41:11Z

Unit, integration and GCE e2e test build/test passed for commit c651fdf92b0d3c08fa811086b6e568f67e5e63d0.

k8s-bot · 2015-10-07T00:42:37Z

GCE e2e build/test failed for commit 64a4f6430a35653a053602c8a1783f23c4a05105.

jackgr · 2015-10-07T17:12:38Z

Not sure how, but the edits I made yesterday got lost during the rebase. Restored them and resubmitted.

cc @jlowdermilk

j3ffml · 2015-10-07T17:18:27Z

lgtm

k8s-bot · 2015-10-07T17:37:45Z

GCE e2e test build/test passed for commit 413104f05c1190a39011453d96da828d440f53e8.

k8s-bot · 2015-10-08T00:57:38Z

GCE e2e test build/test passed for commit 703a3e1.

piosz · 2015-10-08T11:29:29Z

Removing LGTM because there was a change after LGTM was granted. @jlowdermilk could you please take a look?

Add the kubectl apply command

googlebot added the cla: yes label Sep 27, 2015

k8s-github-robot assigned thockin Sep 27, 2015

k8s-github-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 27, 2015

jackgr force-pushed the kubectl_apply branch from 9aa3182 to 91adc9b Compare September 27, 2015 17:17

This was referenced Sep 27, 2015

Add calls to set annotation for kubectl apply #14626

Merged

Configuration reconciliation (aka kubectl apply) #1702

Closed

bgrant0607 assigned ghodss and unassigned thockin Sep 27, 2015

bgrant0607 reviewed Sep 27, 2015
View reviewed changes

jackgr force-pushed the kubectl_apply branch from 91adc9b to e4053d2 Compare September 28, 2015 22:37

jackgr force-pushed the kubectl_apply branch 2 times, most recently from 5f2c43f to 1b50c05 Compare September 28, 2015 23:25

k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 30, 2015

jackgr force-pushed the kubectl_apply branch from 1b50c05 to 31c8d47 Compare September 30, 2015 22:36

jackgr force-pushed the kubectl_apply branch 2 times, most recently from 62e6c7f to e1914c4 Compare October 1, 2015 00:04

jackgr force-pushed the kubectl_apply branch from e1914c4 to 6a632da Compare October 1, 2015 00:48

j3ffml self-assigned this Oct 2, 2015

jackgr force-pushed the kubectl_apply branch 3 times, most recently from 3984e41 to c651fdf Compare October 2, 2015 22:44

j3ffml reviewed Oct 2, 2015
View reviewed changes

k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 5, 2015

jackgr force-pushed the kubectl_apply branch from c651fdf to 64a4f64 Compare October 7, 2015 00:12

k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 7, 2015

jackgr force-pushed the kubectl_apply branch from 64a4f64 to 413104f Compare October 7, 2015 17:07

j3ffml added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2015

jackgr added 2 commits October 7, 2015 17:14

Add method to apply strategic merge patch.

ddda379

Add the kubectl apply command.

703a3e1

jackgr force-pushed the kubectl_apply branch from 413104f to 703a3e1 Compare October 8, 2015 00:15

piosz removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 8, 2015

j3ffml added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 8, 2015

roberthbailey added a commit that referenced this pull request Oct 8, 2015

Merge pull request #14621 from jackgr/kubectl_apply

49d6c86

Add the kubectl apply command

roberthbailey merged commit 49d6c86 into kubernetes:master Oct 8, 2015

jackgr deleted the kubectl_apply branch October 26, 2015 20:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add the kubectl apply command #14621

Add the kubectl apply command #14621

jackgr commented Sep 27, 2015

jackgr commented Sep 27, 2015

k8s-bot commented Sep 27, 2015

k8s-github-robot commented Sep 27, 2015

jackgr commented Sep 27, 2015

k8s-bot commented Sep 27, 2015

bgrant0607 commented Sep 27, 2015

bgrant0607 Sep 27, 2015

jackgr Sep 28, 2015

bgrant0607 commented Sep 27, 2015

k8s-bot commented Sep 28, 2015

k8s-bot commented Sep 28, 2015

k8s-bot commented Sep 29, 2015

k8s-bot commented Sep 30, 2015

k8s-bot commented Oct 1, 2015

k8s-bot commented Oct 1, 2015

jackgr commented Oct 2, 2015

k8s-bot commented Oct 2, 2015

k8s-bot commented Oct 2, 2015

j3ffml Oct 2, 2015

jackgr Oct 5, 2015

k8s-bot commented Oct 2, 2015

k8s-bot commented Oct 7, 2015

jackgr commented Oct 7, 2015

j3ffml commented Oct 7, 2015

k8s-bot commented Oct 7, 2015

k8s-bot commented Oct 8, 2015

piosz commented Oct 8, 2015

Add the kubectl apply command #14621

Add the kubectl apply command #14621

Conversation

jackgr commented Sep 27, 2015

jackgr commented Sep 27, 2015

k8s-bot commented Sep 27, 2015

k8s-github-robot commented Sep 27, 2015

jackgr commented Sep 27, 2015

k8s-bot commented Sep 27, 2015

bgrant0607 commented Sep 27, 2015

bgrant0607 Sep 27, 2015

Choose a reason for hiding this comment

jackgr Sep 28, 2015

Choose a reason for hiding this comment

bgrant0607 commented Sep 27, 2015

k8s-bot commented Sep 28, 2015

k8s-bot commented Sep 28, 2015

k8s-bot commented Sep 29, 2015

k8s-bot commented Sep 30, 2015

k8s-bot commented Oct 1, 2015

k8s-bot commented Oct 1, 2015

jackgr commented Oct 2, 2015

k8s-bot commented Oct 2, 2015

k8s-bot commented Oct 2, 2015

j3ffml Oct 2, 2015

Choose a reason for hiding this comment

jackgr Oct 5, 2015

Choose a reason for hiding this comment

k8s-bot commented Oct 2, 2015

k8s-bot commented Oct 7, 2015

jackgr commented Oct 7, 2015

j3ffml commented Oct 7, 2015

k8s-bot commented Oct 7, 2015

k8s-bot commented Oct 8, 2015

piosz commented Oct 8, 2015