Add the kubectl apply command.

test/e2e/kubectl.go

@@ -17,6 +17,7 @@ limitations under the License.
 package e2e
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -32,10 +33,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ghodss/yaml"
+
 	"k8s.io/kubernetes/pkg/api"
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/kubectl"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/util/wait"
 
@@ -226,6 +230,25 @@ var _ = Describe("Kubectl client", func() {
 		})
 	})
 
+	Describe("Kubectl apply", func() {
+		It("should apply a new configuration to an existing RC", func() {
+			mkpath := func(file string) string {
+				return filepath.Join(testContext.RepoRoot, "examples/guestbook-go", file)
+			}
+			controllerJson := mkpath("redis-master-controller.json")
+			nsFlag := fmt.Sprintf("--namespace=%v", ns)
+			By("creating Redis RC")
+			runKubectl("create", "-f", controllerJson, nsFlag)
+			By("applying a modified configuration")
+			stdin := modifyReplicationControllerConfiguration(controllerJson)
+			newKubectlCommand("apply", "-f", "-", nsFlag).
+				withStdinReader(stdin).
+				exec()
+			By("checking the result")
+			forEachReplicationController(c, ns, "app", "redis", validateReplicationControllerConfiguration)
+		})
+	})
+
 	Describe("Kubectl cluster-info", func() {
 		It("should check if Kubernetes master services is included in cluster-info", func() {
 			By("validating cluster-info")
@@ -811,6 +834,77 @@ type updateDemoData struct {
 	Image string
 }
 
+const applyTestLabel = "kubectl.kubernetes.io/apply-test"
+
+func readBytesFromFile(filename string) []byte {
+	file, err := os.Open(filename)
+	if err != nil {
+		Failf(err.Error())
+	}
+
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		Failf(err.Error())
+	}
+
+	return data
+}
+
+func readReplicationControllerFromFile(filename string) *api.ReplicationController {
+	data := readBytesFromFile(filename)
+	rc := api.ReplicationController{}
+	if err := yaml.Unmarshal(data, &rc); err != nil {
+		Failf(err.Error())
+	}
+
+	return &rc
+}
+
+func modifyReplicationControllerConfiguration(filename string) io.Reader {
+	rc := readReplicationControllerFromFile(filename)
+	rc.Labels[applyTestLabel] = "ADDED"
+	rc.Spec.Selector[applyTestLabel] = "ADDED"
+	rc.Spec.Template.Labels[applyTestLabel] = "ADDED"
+	data, err := json.Marshal(rc)
+	if err != nil {
+		Failf("json marshal failed: %s\n", err)
+	}
+
+	return bytes.NewReader(data)
+}
+
+func forEachReplicationController(c *client.Client, ns, selectorKey, selectorValue string, fn func(api.ReplicationController)) {
+	var rcs *api.ReplicationControllerList
+	var err error
+	for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) {
+		rcs, err = c.ReplicationControllers(ns).List(labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})))
+		Expect(err).NotTo(HaveOccurred())
+		if len(rcs.Items) > 0 {
+			break
+		}
+	}
+
+	if rcs == nil || len(rcs.Items) == 0 {
+		Failf("No replication controllers found")
+	}
+
+	for _, rc := range rcs.Items {
+		fn(rc)
+	}
+}
+
+func validateReplicationControllerConfiguration(rc api.ReplicationController) {
+	if rc.Name == "redis-master" {
+		if _, ok := rc.Annotations[kubectl.LastAppliedConfigAnnotation]; !ok {
+			Failf("Annotation not found in modified configuration:\n%v\n", rc)
+		}
+
+		if value, ok := rc.Labels[applyTestLabel]; !ok || value != "ADDED" {
+			Failf("Added label %s not found in modified configuration:\n%v\n", applyTestLabel, rc)
+		}
+	}
+}
+
 // getUDData creates a validator function based on the input string (i.e. kitten.jpg).
 // For example, if you send "kitten.jpg", this function veridies that the image jpg = kitten.jpg
 // in the container's json field.