Merge pull request #277 from openreplay/dev

v1.4.0: Fixes in helm charts

scripts/helm/openreplay-cli

@@ -109,7 +109,7 @@ legacyInstall() {
 }
 
 helmInstall() {
-    helm upgrade --install openreplay openreplay -f vars.yaml
+    helm upgrade --install openreplay -n app openreplay -f vars.yaml
 }
 
 upgrade() {
@@ -127,7 +127,7 @@ status() {
 
 [[ $# -eq 0 ]] && usage && exit 1
 
-PARSED_ARGUMENTS=$(color getopt -a -n openreplay-cli -o vhds:S:l:r:i:I: --long verbose,help,status,start:,stop:,logs:,restart:,legacy-install:,helm-install: -- "$@")
+PARSED_ARGUMENTS=$(color getopt -a -n openreplay-cli -o vhds:S:l:r:i:I --long verbose,help,status,start:,stop:,logs:,restart:,legacy-install:,helm-install -- "$@")
 VALID_ARGUMENTS=$?
 if [[ "$VALID_ARGUMENTS" != "0" ]]; then
   usage
@@ -140,12 +140,12 @@ do
     -v | --verbose) VERBOSE=1    ; shift   ;;
     -h | --help)    usage        ; shift   ;;
     -d | --status)  status       ; shift   ;;
+    -I | --helm-install) helmInstall; shift ;;
     -s | --stop)    stop $2      ; shift 2 ;;
     -S | --start)   start $2     ; shift 2 ;;
     -l | --logs)    logs "$2"    ; shift 2 ;;
     -r | --restart) restart "$2" ; shift 2 ;;
     -i | --legacy-install) legacyInstall "$2" ; shift 2 ;;
-    -I | --helm-install) helmInstall "$2" ; shift 2 ;;
     # -- means the end of the arguments; drop this, and break out of the while loop
     --) shift; break ;;
     # If invalid options were passed, then getopt should have reported an error,

scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml

@@ -38,6 +38,8 @@ spec:
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            - name: LICENSE_KEY
+              value: '{{ .Values.global.enterpriseEditionLicense }}'
             - name: version_number
               value: '{{ .Chart.AppVersion }}'
             - name: pg_host

scripts/helmcharts/openreplay/charts/db/values.yaml

@@ -75,7 +75,8 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
-env: {}
+env:
+  CLICKHOUSE_STRING: tcp://clickhouse.db.svc.cluster.local:9000/default
 
 
 nodeSelector: {}

scripts/helmcharts/openreplay/templates/job.yaml

@@ -123,7 +123,7 @@ spec:
           - name: KAFKA_SSL
             value: "{{ .Values.global.kafka.kafkaUseSsl }}"
           - name: PREVIOUS_APP_VERSION
-            value: "{{ .Values.global.fromVersion }}"
+            value: "{{ .Values.fromVersion }}"
           - name: CHART_APP_VERSION
             value: "{{ .Chart.AppVersion }}"
         command: