Merge pull request #1351 from weaveworks/issue/1345-init-containers

Fix verification of initContainer releases

cluster/kubernetes/resource/spec.go

@@ -43,7 +43,7 @@ func (t PodTemplate) SetContainerImage(container string, ref image.Ref) error {
 	}
 	for i, c := range t.Spec.InitContainers {
 		if c.Name == container {
-			t.Spec.Containers[i].Image = ref.String()
+			t.Spec.InitContainers[i].Image = ref.String()
 			return nil
 		}
 	}

cluster/kubernetes/testfiles/data.go

@@ -53,6 +53,7 @@ var ResourceMap = map[flux.ResourceID]string{
 	flux.MustParseResourceID("default:deployment/list-deploy"):    "list.yaml",
 	flux.MustParseResourceID("default:service/list-service"):      "list.yaml",
 	flux.MustParseResourceID("default:deployment/semver"):         "semver-deploy.yaml",
+	flux.MustParseResourceID("default:daemonset/init"):            "init.yaml",
 }
 
 // ServiceMap ... given a base path, construct the map representing
@@ -66,6 +67,7 @@ func ServiceMap(dir string) map[flux.ResourceID][]string {
 		flux.MustParseResourceID("default:deployment/multi-deploy"):   []string{filepath.Join(dir, "multi.yaml")},
 		flux.MustParseResourceID("default:deployment/list-deploy"):    []string{filepath.Join(dir, "list.yaml")},
 		flux.MustParseResourceID("default:deployment/semver"):         []string{filepath.Join(dir, "semver-deploy.yaml")},
+		flux.MustParseResourceID("default:daemonset/init"):            []string{filepath.Join(dir, "init.yaml")},
 	}
 }
 
@@ -238,6 +240,23 @@ items:
       app: list-app
 `,
 
+	// A daemonset using initContainers
+	"init.yaml": `---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: init
+spec:
+  template:
+    spec:
+      initContainers:
+      - name: greeter
+        image: quay.io/weaveworks/helloworld:master-a000001
+      containers:
+      - name: unimportant
+        image: alpine:1.0
+`,
+
 	// A tricksy chart directory, which should be skipped entirely. Adapted from
 	// https://github.com/kubernetes/helm/tree/master/docs/examples
 	"charts/nginx/Chart.yaml": `---

cluster/kubernetes/update_test.go

@@ -51,8 +51,10 @@ func TestUpdates(t *testing.T) {
 		{"in kubernetes List resource", case10resource, case10containers, case10image, case10, case10out},
 		{"FluxHelmRelease (simple image encoding)", case11resource, case11containers, case11image, case11, case11out},
 		{"FluxHelmRelease (multi image encoding)", case12resource, case12containers, case12image, case12, case12out},
+		{"initContainer", case13resource, case13containers, case13image, case13, case13out},
 	} {
 		t.Run(c.name, func(t *testing.T) {
+			t.Parallel()
 			testUpdate(t, c)
 		})
 	}
@@ -868,3 +870,42 @@ spec:
     sidecar:
       image: sidecar:v1
 `
+
+const case13 = `---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: weave
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        name: weave
+    spec:
+      initContainers:
+      - name: weave
+        image: 'weaveworks/weave-kube:2.2.0'
+`
+
+const case13resource = "default:deployment/weave"
+const case13image = "weaveworks/weave-kube:2.2.1"
+
+var case13containers = []string{"weave"}
+
+const case13out = `---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: weave
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        name: weave
+    spec:
+      initContainers:
+      - name: weave
+        image: 'weaveworks/weave-kube:2.2.1'
+`

git/gittest/repo.go

@@ -1,12 +1,13 @@
 package gittest
 
 import (
+	"context"
 	"io/ioutil"
 	"os/exec"
 	"path/filepath"
 	"testing"
 
-	"context"
+	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster/kubernetes/testfiles"
 	"github.com/weaveworks/flux/git"
 )
@@ -61,6 +62,16 @@ func Repo(t *testing.T) (*git.Repo, func()) {
 	}
 }
 
+// Workloads is a shortcut to getting the names of the workloads (NB
+// not all resources, just the workloads) represented in the test
+// files.
+func Workloads() (res []flux.ResourceID) {
+	for k, _ := range testfiles.ServiceMap("") {
+		res = append(res, k)
+	}
+	return res
+}
+
 // CheckoutWithConfig makes a standard repo, clones it, and returns
 // the clone, the original repo, and a cleanup function.
 func CheckoutWithConfig(t *testing.T, config git.Config) (*git.Checkout, *git.Repo, func()) {