Add a test for releasing initContainers

.. and make it pass.
fluxcd · Sep 10, 2018 · a2ffde2 · a2ffde2
1 parent 44d5c24
commit a2ffde2
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 1 deletion.
diff --git a/cluster/kubernetes/resource/spec.go b/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
 		}
 	}

diff --git a/cluster/kubernetes/testfiles/data.go b/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": `---

diff --git a/release/releaser_test.go b/release/releaser_test.go
@@ -210,6 +210,57 @@ func (x expected) Result() update.Result {
 	return result
 }
 
+func Test_InitContainer(t *testing.T) {
+	initWorkloadID := flux.MustParseResourceID("default:daemonset/init")
+	initSvc := cluster.Controller{
+		ID: initWorkloadID,
+		Containers: cluster.ContainersOrExcuse{
+			Containers: []resource.Container{
+				{
+					Name:  helloContainer,
+					Image: oldRef,
+				},
+			},
+		},
+	}
+
+	cluster := mockCluster(hwSvc, lockedSvc, initSvc)
+
+	expect := expected{
+		Specific: update.Result{
+			initWorkloadID: update.ControllerResult{
+				Status: update.ReleaseStatusSuccess,
+				PerContainer: []update.ContainerUpdate{
+					update.ContainerUpdate{
+						Container: helloContainer,
+						Current:   oldRef,
+						Target:    newHwRef,
+					},
+				},
+			},
+		},
+		Else: ignoredNotIncluded,
+	}
+
+	initSpec, _ := update.ParseResourceSpec(initWorkloadID.String())
+	spec := update.ReleaseSpec{
+		ServiceSpecs: []update.ResourceSpec{initSpec},
+		ImageSpec:    update.ImageSpecLatest,
+		Kind:         update.ReleaseKindExecute,
+	}
+
+	checkout, clean := setup(t)
+	defer clean()
+
+	testRelease(t, &ReleaseContext{
+		cluster:   cluster,
+		manifests: mockManifests,
+		registry:  mockRegistry,
+		repo:      checkout,
+	}, spec, expect.Result())
+
+}
+
 func Test_FilterLogic(t *testing.T) {
 	cluster := mockCluster(hwSvc, lockedSvc) // no testsvc in cluster, but it _is_ in repo