fix: diffgram settings URL base path

diffgram · Jul 6, 2022 · b0515bf · b0515bf
1 parent 7e96b4d
commit b0515bf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ ca.crt
 ca.key
 
 local-ca.crt
+/values_local.yaml
diff --git a/.helmignore b/.helmignore
@@ -0,0 +1,29 @@
+
+.idea/*
+values_testing.yaml
+values_testing_*
+values_production*
+
+
+values_staging.yaml
+
+.vs
+example.com\+5-key.pem
+
+example.com\+5.pem
+
+example.com\+6-key.pem
+
+example.com\+6.pem
+
+# Chart dependencies
+ca.crt
+
+*.txt
+.git
+README.md
+
+ca.key
+
+local-ca.crt
+/values_local.yaml
diff --git a/templates/diffgram_settings.tpl b/templates/diffgram_settings.tpl
@@ -11,7 +11,12 @@
   GOOGLE_APPLICATION_CREDENTIALS: /etc/gcp/sa_credentials.json # Check the volume in deployment.yaml and service_account_secret.yaml
   CLOUD_STORAGE_BUCKET:  {{ .Values.diffgramSettings.CLOUD_STORAGE_BUCKET }}
   ML__CLOUD_STORAGE_BUCKET:  {{ .Values.diffgramSettings.ML__CLOUD_STORAGE_BUCKET }}
-  URL_BASE: {{ .Values.diffgramDomain }}
+  {{ if eq .Values.useTls true}}
+  URL_BASE: https://{{ .Values.diffgramDomain }}
+  {{ end }}
+  {{ if eq .Values.useTls false}}
+  URL_BASE: http://{{ .Values.diffgramDomain }}
+  {{ end }}
   WALRUS_SERVICE_URL_BASE: https://{{ .Values.diffgramDomain }}
   SERVICE_ACCOUNT_FULL_PATH: {{ .Values.diffgramSettings.SERVICE_ACCOUNT_FULL_PATH }}
   DIFFGRAM_AZURE_CONTAINER_NAME: {{ .Values.diffgramSettings.DIFFGRAM_AZURE_CONTAINER_NAME }}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,4 @@ ca.crt
		ca.key

		local-ca.crt
		/values_local.yaml