Merge pull request #86 from tidepool-org/fix-charts-path

Fix chart generation

Author: toddkazakov

Tiltconfig.yaml

@@ -3,7 +3,6 @@
 # parameters, and update the `hostPath` if you've checked the repo out to a different location.
 
 ### Global Config Start ###
-tidepool_helm_charts_version: '0.1.7' # Version of the Tidepool helm charts to deploy.
 
 global:
   gateway:

Tiltfile

@@ -5,8 +5,7 @@ tidepool_helm_overrides_file = getHelmOverridesFile()
 config = getConfig()
 watch_file(tidepool_helm_overrides_file)
 
-tidepool_helm_charts_version = config.get('tidepool_helm_charts_version')
-tidepool_helm_chart_dir = "./charts/tidepool/{}".format(tidepool_helm_charts_version)
+tidepool_helm_chart_dir = "./charts/tidepool"
 
 is_shutdown = isShutdown()
 ### Config End ###

Tiltfile.gateway

@@ -5,8 +5,7 @@ tidepool_helm_overrides_file = getHelmOverridesFile()
 config = getConfig()
 watch_file(tidepool_helm_overrides_file)
 
-tidepool_helm_charts_version = config.get('tidepool_helm_charts_version')
-tidepool_helm_chart_dir = "./charts/tidepool/{}".format(tidepool_helm_charts_version)
+tidepool_helm_chart_dir = "./charts/tidepool"
 
 gloo_chart_dir = './local/charts'
 absolute_gloo_chart_dir = getAbsoluteDir(gloo_chart_dir)

bin/gen_random_secrets

@@ -40,7 +40,7 @@ QUICKSTART_DIR=$(realpath ./tidepool-quickstart)
 git clone [email protected]:/tidepool-org/development >/dev/null 2>&1
 (cd development; git checkout k8s >/dev/null 2>&1)
 DEV_DIR=$(realpath development)
-CHART_DIR=$DEV_DIR/charts/tidepool/0.1.7
+CHART_DIR=$DEV_DIR/charts/tidepool
 
 # clone config repo
 git clone $remote >/dev/null 2>&1

bin/gen_templated_secrets

@@ -22,7 +22,7 @@ QUICKSTART_DIR=$(realpath ./tidepool-quickstart)
 git clone [email protected]:/tidepool-org/development >/dev/null 2>&1
 (cd development; git checkout k8s >/dev/null 2>&1)
 DEV_DIR=$(realpath development)
-CHART_DIR=$DEV_DIR/charts/tidepool/0.1.7
+CHART_DIR=$DEV_DIR/charts/tidepool
 
 # run template processor to create non-Tidepool services
 cd $QUICKSTART_DIR

charts/tidepool/charts/glooingress/values.yaml

@@ -16,15 +16,18 @@ virtualServices:
     enabled: true                       # whether to accept HTTP requests
     redirect: false                     # whether to redirect HTTP requests to HTTPS
     labels: {}
+    options: {}
   https:
     name: https
     dnsNames: []                        # DNS names served with HTTPS
     enabled: false                      # whether to serve HTTPS
     hsts: false                         # whether to require Strict Transport Security
     labels: {}
+    options: {}
   httpInternal:
     name: http-internal
     labels: {}
+    options: {}
 gloo:
   enabled: false                        # whether to install the Gloo API Gateway control plane
   crds: