Merge pull request #188 from Liujingfang1/cr

Enable imageTagTransformer in application

pkg/app/application.go

@@ -169,11 +169,20 @@ func (a *Application) loadCustomizedResMap() (resmap.ResMap, error) {
 	if len(errs.Get()) > 0 {
 		return nil, errs
 	}
+
+	var r []transformers.Transformer
 	t, err := a.newTransformer(patches)
 	if err != nil {
 		return nil, err
 	}
-	err = t.Transform(result)
+	r = append(r, t)
+	t, err = transformers.NewImageTagTransformer(a.kustomization.ImageTags)
+	if err != nil {
+		return nil, err
+	}
+	r = append(r, t)
+
+	err = transformers.NewMultiTransformer(r).Transform(result)
 	if err != nil {
 		return nil, err
 	}

pkg/commands/testdata/testcase-simple/expected.diff

@@ -48,7 +48,7 @@ diff -u -N /tmp/noop/extensions_v1beta1_Deployment_mungebot.yaml /tmp/transforme
          - name: foo
            value: bar
 -        image: nginx
-+        image: nginx:1.7.9
++        image: nginx:1.8.0
          name: nginx
          ports:
          - containerPort: 80

pkg/commands/testdata/testcase-simple/expected.yaml

@@ -111,7 +111,7 @@ spec:
               name: test-infra-app-tls-6hkmhf2224
         - name: foo
           value: bar
-        image: nginx:1.7.9
+        image: nginx:1.8.0
         name: nginx
         ports:
         - containerPort: 80

pkg/examplelayout/simple/instances/exampleinstance/kustomization.yaml

@@ -21,3 +21,6 @@ secretGenerator:
     tls.crt: "cat secret/tls.cert"
     tls.key: "cat secret/tls.key"
   type: "kubernetes.io/tls"
+imageTags:
+- name: nginx
+  newTag: 1.8.0

pkg/transformers/imagetag.go

@@ -55,15 +55,25 @@ func (pt *imageTagTransformer) Transform(resources resmap.ResMap) error {
  then loops though all images inside containers session, finds matched ones and update the tag name
 */
 func (pt *imageTagTransformer) findAndReplaceTag(obj map[string]interface{}) error {
-	_, found := obj["containers"]
+	paths := []string{"containers", "initContainers"}
+	found := false
+	for _, path := range paths {
+		_, found = obj[path]
 		if found {
-		return pt.updateContainers(obj)
+			err := pt.updateContainers(obj, path)
+			if err != nil {
+				return err
 			}
+		}
+	}
+	if !found {
 		return pt.findContainers(obj)
+	}
+	return nil
 }
 
-func (pt *imageTagTransformer) updateContainers(obj map[string]interface{}) error {
-	containers := obj["containers"].([]interface{})
+func (pt *imageTagTransformer) updateContainers(obj map[string]interface{}, path string) error {
+	containers := obj[path].([]interface{})
 	for i := range containers {
 		container := containers[i].(map[string]interface{})
 		image, found := container["image"]

pkg/transformers/imagetag_test.go

@@ -39,15 +39,17 @@ func TestImageTagTransformer(t *testing.T) {
 				"spec": map[string]interface{}{
 					"template": map[string]interface{}{
 						"spec": map[string]interface{}{
+							"initContainers": []interface{}{
+								map[string]interface{}{
+									"name":  "nginx2",
+									"image": "my-nginx:1.8.0",
+								},
+							},
 							"containers": []interface{}{
 								map[string]interface{}{
 									"name":  "nginx",
 									"image": "nginx:1.7.9",
 								},
-								map[string]interface{}{
-									"name":  "nginx2",
-									"image": "my-nginx:1.8.0",
-								},
 							},
 						},
 					},
@@ -101,15 +103,17 @@ func TestImageTagTransformer(t *testing.T) {
 				"spec": map[string]interface{}{
 					"template": map[string]interface{}{
 						"spec": map[string]interface{}{
+							"initContainers": []interface{}{
+								map[string]interface{}{
+									"name":  "nginx2",
+									"image": "my-nginx:previous",
+								},
+							},
 							"containers": []interface{}{
 								map[string]interface{}{
 									"name":  "nginx",
 									"image": "nginx:v2",
 								},
-								map[string]interface{}{
-									"name":  "nginx2",
-									"image": "my-nginx:previous",
-								},
 							},
 						},
 					},