Merge pull request #362 from vdice/feat/use-upstream-docker-gc-chart

feat(chart): use upstream stable/spotify-docker-gc chart
deis · May 31, 2017 · dec22e1 · dec22e1
2 parents 89fe7e3 + f9c6a4a
commit dec22e1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git a/charts/workflow-e2e/.gitignore b/charts/workflow-e2e/.gitignore
@@ -0,0 +1,2 @@
+charts
+requirements.lock
diff --git a/charts/workflow-e2e/requirements.yaml b/charts/workflow-e2e/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+  - name: spotify-docker-gc
+    version: 0.1.0
+    repository: https://kubernetes-charts.storage.googleapis.com
diff --git a/charts/workflow-e2e/templates/NOTES.txt b/charts/workflow-e2e/templates/NOTES.txt
@@ -0,0 +1,5 @@
+To monitor tests as they execute:
+
+```console
+$ kubectl --namespace={{ .Release.Namespace }} logs -f workflow-e2e tests
+```
diff --git a/charts/workflow-e2e/templates/spotify-gc-daemon.yaml b/charts/workflow-e2e/templates/spotify-gc-daemon.yaml
diff --git a/charts/workflow-e2e/templates/workflow-e2e-pod.yaml b/charts/workflow-e2e/templates/workflow-e2e-pod.yaml
@@ -17,7 +17,7 @@ spec:
         value: "true"
       - name: CLI_VERSION
         value: "{{.Values.cli_version}}"
-       # set TEST env variable to run appropriate tests in e2e suite
+      # set TEST env variable to run appropriate tests in e2e suite
       - name: TEST
         value: "{{.Values.test}}"
       - name: DEBUG_MODE

diff --git a/charts/workflow-e2e/values.yaml b/charts/workflow-e2e/values.yaml
@@ -6,3 +6,9 @@ ginkgo_nodes: 15
 cli_version: "latest"
 test: "e2e"
 debug_mode: "false"
+
+spotify-docker-gc:
+  cron:
+    schedule: "*/1 * * * *"
+  env:
+    dockerAPIVersion: "1.23"