Fix helm template dockerfile and docker e2e tests

Author: prachirp

tests/e2e.sh

@@ -28,6 +28,8 @@ metadata:
 items: []
 EOF
 )
+HELM_ERROR_SNIPPET="Helm template command results in error"
+CHARTS_SRC="charts/bitnami"
 
 ############################
 # Test framework
@@ -209,6 +211,47 @@ assert_dir_exists payments-dev
 assert_dir_exists payments-prod
 grep -q allowPrivilegeEscalation podsecuritypolicy_psp.yaml
 
+helm_testcase "docker_helm_template_expected_args"
+docker run -u "$(id -u)" -v "$(pwd)/${CHARTS_SRC}":/source gcr.io/kpt-functions/helm-template:"${TAG}" -i /dev/null -d name=expected-args -d chart_path=/source/redis >out.yaml
+assert_contains_string out.yaml "expected-args"
+
+helm_testcase "docker_helm_template_error_too_few_args"
+docker run -u "$(id -u)" -v "$(pwd)/${CHARTS_SRC}":/source gcr.io/kpt-functions/helm-template:"${TAG}" -i /dev/null -d name=too-few-args 2>err.txt || true
+assert_contains_string err.txt "${HELM_ERROR_SNIPPET}"
+
+helm_testcase "docker_helm_template_extra_args"
+cat >fc.yaml <<EOF
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: my-config
+  annotations:
+    config.k8s.io/function: |
+      container:
+        image:  gcr.io/kpt-functions/helm-template
+    config.kubernetes.io/local-config: "true"
+data:
+  name: extra-args
+  chart_path: /source/charts/bitnami/redis
+  --values: /source/charts/bitnami/redis/values-production.yaml
+EOF
+docker run -u "$(id -u)" -v "$(pwd)":/source gcr.io/kpt-functions/helm-template:"${TAG}" -i /dev/null -f /source/fc.yaml >out.yaml
+assert_contains_string out.yaml "extra-args"
+
+helm_testcase "docker_helm_template_sink"
+docker run -u "$(id -u)" -v "$(pwd)/${CHARTS_SRC}":/source gcr.io/kpt-functions/helm-template:"${TAG}" -i /dev/null -d chart_path=/source/redis -d name=sink-redis |
+  docker run -i -u "$(id -u)" -v "$(pwd)":/sink gcr.io/kpt-functions/write-yaml:"${TAG}" -o /dev/null -d sink_dir=/sink -d overwrite=true
+assert_dir_exists default
+assert_contains_string default/secret_sink-redis.yaml "sink-redis"
+
+helm_testcase "docker_helm_template_pipeline"
+docker run -u "$(id -u)" -v "$(pwd)/${CHARTS_SRC}":/source gcr.io/kpt-functions/helm-template:"${TAG}" -i /dev/null -d chart_path=/source/mongodb -d name=my-mongodb |
+  docker run -i -u "$(id -u)" -v "$(pwd)/${CHARTS_SRC}":/source gcr.io/kpt-functions/helm-template:"${TAG}" -d name=my-redis -d chart_path=/source/redis |
+  docker run -i -u "$(id -u)" -v "$(pwd)":/sink gcr.io/kpt-functions/write-yaml:"${TAG}" -o /dev/null -d sink_dir=/sink -d overwrite=true
+assert_dir_exists default
+assert_contains_string default/secret_my-mongodb.yaml "my-mongodb"
+assert_contains_string default/secret_my-redis.yaml "my-redis"
+
 ############################
 # kpt fn Tests
 ############################
@@ -273,3 +316,13 @@ EOF
 kpt fn run .
 grep -qR 'color: orange' .
 grep -qR 'city: toronto' .
+
+# TODO: Add kpt_helm_template_imperative_short and kpt_helm_template_declarative tests after fixing <https://github.com/GoogleContainerTools/kpt/issues/587>
+helm_testcase "kpt_helm_template_imperative"
+kpt fn source example-configs |
+  docker run -i -u "$(id -u)" -v "$(pwd)/${CHARTS_SRC}":/source gcr.io/kpt-functions/helm-template:"${TAG}" -d chart_path=/source/mongodb -d name=my-mongodb |
+  docker run -i -u "$(id -u)" -v "$(pwd)/${CHARTS_SRC}":/source gcr.io/kpt-functions/helm-template:"${TAG}" -d name=my-redis -d chart_path=/source/redis |
+  kpt fn sink example-configs
+assert_dir_exists example-configs/default
+assert_contains_string example-configs/default/secret_my-mongodb.yaml "my-mongodb"
+assert_contains_string example-configs/default/secret_my-redis.yaml "my-redis"

ts/demo-functions/build/helm_template.Dockerfile

@@ -20,17 +20,25 @@ RUN npm run build && \
 
 #############################################
 
-FROM alpine/helm:3.2.1
-
-WORKDIR /home/node/app
-
-COPY --from=builder /home/node/app /home/node/app
+FROM node:10-alpine
 
 RUN apk add bash curl git
 RUN apk update
 
-RUN curl -fsSL -o /usr/local/bin/kpt https://storage.googleapis.com/kpt-dev/latest/linux_amd64/kpt
-RUN chmod +x /usr/local/bin/kpt
+ENV HELM_LATEST_VERSION="v3.2.1"
+RUN curl -fsSL -o /helm-${HELM_LATEST_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-${HELM_LATEST_VERSION}-linux-amd64.tar.gz && \
+    tar -zxvf /helm-${HELM_LATEST_VERSION}-linux-amd64.tar.gz && \
+    mv /linux-amd64/helm /usr/local/bin/helm && \
+    rm -f /helm-${HELM_LATEST_VERSION}-linux-amd64.tar.gz && \
+    rm -rf /linux-amd64
+
+RUN curl -fsSL -o /usr/local/bin/kpt https://storage.googleapis.com/kpt-dev/latest/linux_amd64/kpt && \
+    chmod +x /usr/local/bin/kpt
+
 ENV PATH /usr/local/bin:$PATH
 
+WORKDIR /home/node/app
+
+COPY --from=builder /home/node/app /home/node/app
+
 ENTRYPOINT ["node", "/home/node/app/dist/helm_template_run.js"]