Restore refactor of Helm template file writing logic (see #385)

This reverts commit 4cc5ccb.

integration/base/helm-fetch/expected/.ship/release.yml

@@ -2,18 +2,11 @@
 ---
 assets:
   v1:
-  - inline:
-      contents: |
-        this exists to create the charts directory
-        it should be removed when that bug is resolved
-        see https://github.com/replicatedhq/ship/issues/373
-      dest: ./charts/mkdir.sh
-      mode: 0777
-  - helm:
-      dest: charts/rendered
-      helm_fetch:
-        chart_ref: stable/mysql
-        version: "0.8.3"
+    - helm:
+        dest: charts/rendered
+        helm_fetch:
+          chart_ref: stable/mysql
+          version: "0.8.3"
 config: {}
 lifecycle:
   v1:

integration/base/helm-fetch/input/.ship/release.yml

@@ -2,18 +2,11 @@
 ---
 assets:
   v1:
-  - inline:
-      contents: |
-        this exists to create the charts directory
-        it should be removed when that bug is resolved
-        see https://github.com/replicatedhq/ship/issues/373
-      dest: ./charts/mkdir.sh
-      mode: 0777
-  - helm:
-      dest: charts/rendered
-      helm_fetch:
-        chart_ref: stable/mysql
-        version: "0.8.3"
+    - helm:
+        dest: charts/rendered
+        helm_fetch:
+          chart_ref: stable/mysql
+          version: "0.8.3"
 config: {}
 lifecycle:
   v1:

integration/base/helm-fetch/metadata.yaml

@@ -1,3 +1,3 @@
 disable_online: true
 
-skip_cleanup: true
+skip_cleanup: false

integration/base/helm-with-sub-charts/expected/.ship/release.yml

@@ -0,0 +1,12 @@
+---
+assets:
+  v1:
+    - helm:
+        dest: charts/rendered
+        helm_fetch:
+          chart_ref: stable/datadog
+          version: "1.0.1"
+config: {}
+lifecycle:
+  v1:
+  - render: {}

integration/base/helm-with-sub-charts/expected/.ship/state.json

@@ -0,0 +1 @@
+{"v1":{"config":{}}}

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/apikey-secret.yaml

@@ -0,0 +1,16 @@
+##---
+# Source: datadog/templates/apikey-secret.yaml
+
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ship-datadog
+  labels:
+    app: "ship-datadog"
+    chart: "datadog-1.0.1"
+    release: "ship"
+    heritage: "Tiller"
+type: Opaque
+data:
+  api-key: "TUlTU0lORw=="

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/charts/kube-state-metrics/templates/clusterrole.yaml

@@ -0,0 +1,99 @@
+##---
+# Source: datadog/charts/kube-state-metrics/templates/clusterrole.yaml
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  labels:
+    app: kube-state-metrics
+    chart: kube-state-metrics-0.8.0
+    heritage: Tiller
+    release: ship
+  name: ship-kube-state-metrics
+rules:
+
+- apiGroups: ["batch"]
+  resources:
+  - cronjobs
+  verbs: ["list", "watch"]
+
+- apiGroups: ["extensions"]
+  resources:
+  - daemonsets
+  verbs: ["list", "watch"]
+
+- apiGroups: ["extensions"]
+  resources:
+  - deployments
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - endpoints
+  verbs: ["list", "watch"]
+
+- apiGroups: ["autoscaling"]
+  resources:
+  - horizontalpodautoscalers
+  verbs: ["list", "watch"]
+
+- apiGroups: ["batch"]
+  resources:
+  - jobs
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - limitranges
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - namespaces
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - nodes
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - persistentvolumeclaims
+  verbs: ["list", "watch"]
+
+
+- apiGroups: [""]
+  resources:
+  - persistentvolumes
+  verbs: ["list", "watch"]
+
+
+- apiGroups: [""]
+  resources:
+  - pods
+  verbs: ["list", "watch"]
+
+- apiGroups: ["extensions"]
+  resources:
+  - replicasets
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - replicationcontrollers
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - resourcequotas
+  verbs: ["list", "watch"]
+
+- apiGroups: [""]
+  resources:
+  - services
+  verbs: ["list", "watch"]
+
+- apiGroups: ["apps"]
+  resources:
+  - statefulsets
+  verbs: ["list", "watch"]

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/charts/kube-state-metrics/templates/clusterrolebinding.yaml

@@ -0,0 +1,19 @@
+##---
+# Source: datadog/charts/kube-state-metrics/templates/clusterrolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app: kube-state-metrics
+    chart: kube-state-metrics-0.8.0
+    heritage: Tiller
+    release: ship
+  name: ship-kube-state-metrics
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ship-kube-state-metrics
+subjects:
+- kind: ServiceAccount
+  name: ship-kube-state-metrics
+  namespace: default

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/charts/kube-state-metrics/templates/deployment.yaml

@@ -0,0 +1,89 @@
+##---
+# Source: datadog/charts/kube-state-metrics/templates/deployment.yaml
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: ship-kube-state-metrics
+  labels:
+    app: kube-state-metrics
+    chart: "kube-state-metrics-0.8.0"
+    release: "ship"
+    heritage: "Tiller"
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: kube-state-metrics
+        release: "ship"
+    spec:
+      serviceAccountName: ship-kube-state-metrics
+      containers:
+      - name: kube-state-metrics
+        args:
+
+        - --collectors=cronjobs
+
+
+        - --collectors=daemonsets
+
+
+        - --collectors=deployments
+
+
+        - --collectors=endpoints
+
+
+        - --collectors=horizontalpodautoscalers
+
+
+        - --collectors=jobs
+
+
+        - --collectors=limitranges
+
+
+        - --collectors=namespaces
+
+
+        - --collectors=nodes
+
+
+        - --collectors=persistentvolumeclaims
+
+
+        - --collectors=persistentvolumes
+
+
+        - --collectors=pods
+
+
+        - --collectors=replicasets
+
+
+        - --collectors=replicationcontrollers
+
+
+        - --collectors=resourcequotas
+
+
+        - --collectors=services
+
+
+        - --collectors=statefulsets
+
+
+        imagePullPolicy: IfNotPresent
+        image: "k8s.gcr.io/kube-state-metrics:v1.3.1"
+        ports:
+        - containerPort: 8080
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        resources:
+            null
+
+

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/charts/kube-state-metrics/templates/service.yaml

@@ -0,0 +1,23 @@
+##---
+# Source: datadog/charts/kube-state-metrics/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: ship-kube-state-metrics
+  labels:
+    app: kube-state-metrics
+    chart: "kube-state-metrics-0.8.0"
+    release: "ship"
+    heritage: "Tiller"
+  annotations:
+    prometheus.io/scrape: 'true'
+spec:
+  type: "ClusterIP"
+  ports:
+  - name: "http"
+    protocol: TCP
+    port: 8080
+    targetPort: 8080
+  selector:
+    app: kube-state-metrics
+    release: ship

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/charts/kube-state-metrics/templates/serviceaccount.yaml

@@ -0,0 +1,11 @@
+##---
+# Source: datadog/charts/kube-state-metrics/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: kube-state-metrics
+    chart: kube-state-metrics-0.8.0
+    heritage: Tiller
+    release: ship
+  name: ship-kube-state-metrics

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/clusterrole.yaml

@@ -0,0 +1,38 @@
+##---
+# Source: datadog/templates/clusterrole.yaml
+apiVersion: "rbac.authorization.k8s.io/v1"
+kind: ClusterRole
+metadata:
+  labels:
+    app: "ship-datadog"
+    chart: "datadog-1.0.1"
+    heritage: "Tiller"
+    release: "ship"
+  name: ship-datadog
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - events
+  - endpoints
+  - pods
+  - nodes
+  - componentstatuses
+  verbs:
+  - get
+  - list
+  - watch
+- nonResourceURLs:
+  - "/version"
+  - "/healthz"
+  verbs:
+  - get
+- apiGroups:  # Kubelet connectivity
+  - ""
+  resources:
+  - nodes/metrics
+  - nodes/spec
+  - nodes/proxy
+  verbs:
+  - get

integration/base/helm-with-sub-charts/expected/installer/charts/rendered/clusterrolebinding.yaml

@@ -0,0 +1,19 @@
+##---
+# Source: datadog/templates/clusterrolebinding.yaml
+apiVersion: "rbac.authorization.k8s.io/v1"
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app: "ship-datadog"
+    chart: "datadog-1.0.1"
+    release: "ship"
+    heritage: "Tiller"
+  name: ship-datadog
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ship-datadog
+subjects:
+  - kind: ServiceAccount
+    name: ship-datadog
+    namespace: default