Fixes issue #53

.travis.yml

@@ -15,11 +15,11 @@ jobs:
       name: "Lint and install charts"
       env:
         - CHART_TESTING_IMAGE=quay.io/helmpack/chart-testing
-        - CHART_TESTING_TAG=v2.0.1
+        - CHART_TESTING_TAG=v3.0.0-beta.1
         - TEST_IMAGE=gcr.io/kubernetes-charts-ci/test-image
-        - TEST_IMAGE_TAG=v3.0.1
+        - TEST_IMAGE_TAG=v3.4.0
         - CHARTS_REPO=https://github.com/EventStore/EventStore.Charts
-        - K8S_VERSION="v1.11.3"
+        - K8S_VERSION="v1.17.0"
       script:
         - echo "Run chart-testing linting!"
         - ./test/lint-charts.sh

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog 
-# 
+#
+## 0.2.6 December 31, 2019
+- Fixed 'helm install eventstore ./ --set clusterSize=3'
+- Updated e2e-docker4mac.sh test script to work with helm v3
+
 ## 0.2.5: August 30, 2019
 - __Potentially breaking__: Add release namespace to all resources to work with `helm template`
 See https://github.com/helm/helm/issues/5465 for more information.

docs/index.yaml

@@ -3,7 +3,30 @@ entries:
   eventstore:
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9924404-04:00
+    created: "2019-12-30T23:39:37.914903+01:00"
+    description: A Helm chart for Kubernetes EventStore.
+    digest: f6cabf42b3418be98bdce79d737d2ea93a6a66d074a380cb8c2b597e5a7900d3
+    home: https://eventstore.org/
+    icon: https://eventstore.org/images/ouro-full.svg
+    keywords:
+    - eventstore
+    maintainers:
+    - email: [email protected]
+      name: ameier38
+    - email: [email protected]
+      name: jhinds
+    - email: [email protected]
+      name: riccardone
+    name: eventstore
+    sources:
+    - https://github.com/EventStore/eventstore-docker
+    - https://github.com/EventStore/EventStore
+    urls:
+    - https://eventstore.github.io/EventStore.Charts/eventstore-0.2.6.tgz
+    version: 0.2.6
+  - apiVersion: v1
+    appVersion: 4.1.1-hotfix1
+    created: "2019-12-30T23:39:37.913691+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: b813a4de6d498d94ec0b837c59731e3693d291a38ea236dadd47aff302d93d2a
     home: https://eventstore.org/
@@ -26,7 +49,7 @@ entries:
     version: 0.2.5
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9914424-04:00
+    created: "2019-12-30T23:39:37.90858+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: 68d0cca0734f9068f249e7be11d8a89ec88cda3bf04e9b27037a472c8fe3c305
     home: https://eventstore.org/
@@ -49,7 +72,7 @@ entries:
     version: 0.2.4
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9904401-04:00
+    created: "2019-12-30T23:39:37.906432+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: ad118ce22cf08b05416f8011ef36ec7919f76794f3eef54cd4fe9bb6e07f9f53
     home: https://eventstore.org/
@@ -72,7 +95,7 @@ entries:
     version: 0.2.3
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9894399-04:00
+    created: "2019-12-30T23:39:37.902699+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: e27e825341c9372ce43ad11fc3066d55be8ec70b131d84b8cd2eb5a17e28b8d4
     home: https://eventstore.org/
@@ -95,7 +118,7 @@ entries:
     version: 0.2.2
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9884383-04:00
+    created: "2019-12-30T23:39:37.897533+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: d2e5f592d2cc4278005f33d64ff0dd70c4d60982e3a27a3e0e6fce28fe7aac50
     home: https://eventstore.org/
@@ -118,7 +141,7 @@ entries:
     version: 0.2.1
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.987439-04:00
+    created: "2019-12-30T23:39:37.895002+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: c52383cc1c4647b8b11a11f1203dbad6ae558b0ca1afc8e94899fc9eac3d716f
     home: https://eventstore.org/
@@ -141,7 +164,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9864386-04:00
+    created: "2019-12-30T23:39:37.891025+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: cba0d053c15705dc6e56ab3421825fab67a1926580651cf9e16df4639c7d2aeb
     home: https://eventstore.org/
@@ -164,7 +187,7 @@ entries:
     version: 0.1.5
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9864386-04:00
+    created: "2019-12-30T23:39:37.888759+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: 0c55e844c4b1095f7330067fb35fce2577f633a2f3335b93f7bc93b362d840b7
     home: https://eventstore.org/
@@ -187,7 +210,7 @@ entries:
     version: 0.1.4
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9854392-04:00
+    created: "2019-12-30T23:39:37.883735+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: 78cf6ea79b5edbc77163c2261b5105a11712f49acbd5b4151fdbd32a5faf3354
     home: https://eventstore.org/
@@ -210,7 +233,7 @@ entries:
     version: 0.1.3
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9844397-04:00
+    created: "2019-12-30T23:39:37.878557+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: 1f1c300846d608d990ea03d992b6c8169a8a62ae48bc39e7e4688b09d6d868b4
     home: https://eventstore.org/
@@ -233,7 +256,7 @@ entries:
     version: 0.1.2
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9834402-04:00
+    created: "2019-12-30T23:39:37.876803+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: b328c5794fd7a7c8f1f802144d4c351e09242d1107e25ea1dd840bf7ab8ad102
     home: https://eventstore.org/
@@ -256,7 +279,7 @@ entries:
     version: 0.1.1
   - apiVersion: v1
     appVersion: 4.1.1-hotfix1
-    created: 2019-08-31T17:17:12.9824401-04:00
+    created: "2019-12-30T23:39:37.874709+01:00"
     description: A Helm chart for Kubernetes EventStore.
     digest: 8b4974e422069914c1fe4a8203bca4947a1ebe91c8978c0ed4857be811eb7cad
     home: https://eventstore.org/
@@ -277,4 +300,4 @@ entries:
     urls:
     - https://eventstore.github.io/EventStore.Charts/eventstore-0.1.0.tgz
     version: 0.1.0
-generated: 2019-08-31T17:17:12.9814389-04:00
+generated: "2019-12-30T23:39:37.862008+01:00"

stable/eventstore/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Helm chart for Kubernetes EventStore.
 name: eventstore
 home: https://eventstore.org/
-version: 0.2.5
+version: 0.2.6
 appVersion: 4.1.1-hotfix1
 keywords:
   - eventstore

stable/eventstore/templates/NOTES.txt

@@ -9,15 +9,15 @@ You can access Event Store:
 
   * Within your cluster, using the following URI:
 
-    {{ if gt .Values.clusterSize 1.0 }}
+    {{ if gt (int (toString (.Values.clusterSize))) 1 }}
     discover://{{ include "eventstore.dns" . }}:{{ .Values.extHttpPort }}
     {{ else }}
     tcp://{{ include "eventstore.dns" . }}:{{ .Values.extTcpPort }}
     {{ end }}
 
     ref: https://eventstore.org/docs/dotnet-api/connecting-to-a-server/index.html#uris
 
-{{- if gt .Values.clusterSize 1.0 }}
+{{- if gt (int (toString (.Values.clusterSize))) 1 }}
 You can access the Event Store admin interface:
   * From outside the cluster:
     {{- if contains "NodePort" .Values.admin.serviceType }}

stable/eventstore/templates/eventstore-statefulset.yaml

@@ -63,7 +63,7 @@ spec:
                 fieldRef:
                   fieldPath: status.podIP
             {{- end }}
-          {{- if and .Values.extIp (gt .Values.clusterSize 1.0) }}
+          {{- if and .Values.extIp (gt (int (toString (.Values.clusterSize))) 1) }}
             - name: EVENTSTORE_EXT_IP_ADVERTISE_AS
               valueFrom:
                 fieldRef:

test/ct.yaml

@@ -3,4 +3,4 @@ target-branch: master
 charts:
   - stable/eventstore
 excluded-charts: []
-helm-extra-args: --timeout 4000
+helm-extra-args: --timeout 4000s

test/e2e-docker4mac.sh

@@ -31,7 +31,7 @@ main() {
     configure_kubectl "$testcontainer_id"
 
     # --- Work around for Tillerless Helm, till Helm v3 gets released --- #
-    run_tillerless
+    #run_tillerless
     # ---------- #
 
     run_test
@@ -92,10 +92,10 @@ run_test() {
 
     # --- Work around for Tillerless Helm, till Helm v3 gets released --- #
     # shellcheck disable=SC2086
-    docker exec -e HELM_HOST=127.0.0.1:44134 -e HELM_TILLER_SILENT=true "$testcontainer_id" ct install ${CHART_TESTING_ARGS} --config /workdir/test/ct.yaml
+    #docker exec -e HELM_HOST=127.0.0.1:44134 -e HELM_TILLER_SILENT=true "$testcontainer_id" ct install ${CHART_TESTING_ARGS} --config /workdir/test/ct.yaml
     # ------------------------------------------------------------------- #
 
-    ##### docker exec "$testcontainer_id" ct install ${CHART_TESTING_ARGS} --config /workdir/test/ct.yaml
+    docker exec "$testcontainer_id" ct install ${CHART_TESTING_ARGS} --config /workdir/test/ct.yaml
 
     echo "Done Testing!"
 }

test/e2e-kind.sh

@@ -52,7 +52,7 @@ install_hostpath-provisioner() {
      kubectl delete storageclass standard
 
      echo "Install Hostpath Provisioner..."
-     docker exec -e HELM_HOST=127.0.0.1:44134 -e HELM_TILLER_SILENT=true "$config_container_id" helm upgrade --install hostpath-provisioner --namespace kube-system test/hostpath-provisioner-0.2.3.tgz
+     docker exec "$config_container_id" helm upgrade --install hostpath-provisioner --namespace kube-system test/hostpath-provisioner-0.2.3.tgz
      echo
 }
 
@@ -83,7 +83,7 @@ main() {
     echo
 
     # --- Work around for Tillerless Helm, till Helm v3 gets released --- #
-    run_tillerless
+    #run_tillerless
 
     # Install hostpath-provisioner for Dynammic PVC provisioning
     install_hostpath-provisioner