Merge pull request #103 from microsoft/update-to-track-configdir

Update config directory for appsettings.json to SPACEFX_CONFIG_DIR
microsoft · Aug 2, 2024 · 14c8f28 · 14c8f28
2 parents b41347e + 50380ae
commit 14c8f28
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/chart/templates/_appsettings.tpl b/chart/templates/_appsettings.tpl
@@ -62,5 +62,5 @@ configMap:
 {{- $serviceValues := .serviceValues }}
 {{- $globalValues := .globalValues }}
 name: {{ $serviceValues.appName }}-config-volume
-mountPath: {{ $serviceValues.workingDir }}-config
+mountPath: {{ $globalValues.spacefxSecretDirectory }}/config
 {{- end }}
diff --git a/chart/templates/payload_app_template.yaml b/chart/templates/payload_app_template.yaml
@@ -25,8 +25,8 @@
 # VolumeMounts
 {{- if $serviceValues.fileServer.volumeMountsEnabled }}
 volumeMounts:
-{{- $secretsMount := printf "%s" (include "spacefx.appsettings.json.volumemount" (dict "globalValues" $globalValues "serviceValues" $serviceValues) | nindent 2 | trim) }}
-{{- printf "- %s" $secretsMount | nindent 2 }}
+{{- $appSettingsMount := printf "%s" (include "spacefx.appsettings.json.volumemount" (dict "globalValues" $globalValues "serviceValues" $serviceValues) | nindent 2 | trim) }}
+{{- printf "- %s" $appSettingsMount | nindent 2 }}
 {{- range $volumeKey, $volumeName := $globalValues.xferVolumes }}
 {{- $fileServerVolumeMount := printf "%s" (include "spacefx.fileserver.clientapp.volumemount" (dict "globalValues" $globalValues "serviceValues" $serviceValues "volumeName" $volumeName) | nindent 2 | trim) }}
 {{- printf "- %s" $fileServerVolumeMount | nindent 2 }}
@@ -43,8 +43,6 @@ volumeMounts:
     mountPath: {{ $hostDirectoryMount.hostPath }}
 {{- end }}
 {{- end }}
-{{- $appSettingsMount := printf "%s" (include "spacefx.appsettings.json.volumemount" (dict "globalValues" $globalValues "serviceValues" $serviceValues) | nindent 2 | trim) }}
-{{- printf "- %s" $appSettingsMount | nindent 2 }}
 {{- end }}
 # Volumes
 {{- if $serviceValues.fileServer.volumesEnabled }}
@@ -75,4 +73,7 @@ volumes:
 {{- if $serviceValues.serviceAccount.enabled }}
 {{- include "spacefx.service_account" (dict "serviceValues" $serviceValues "globalValues" $globalValues) }}
 {{- end }}
+{{- if $serviceValues.restartPolicy.enabled }}
+{{  $serviceValues.restartPolicy.restartPolicy | quote }}
+{{- end }}
 {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -393,6 +393,9 @@ services:
       workingDir: /workspaces/hostsvc-position
   payloadapp:
     payloadappTemplate:
+      restartPolicy:
+        enabled: false
+        restartPolicy: Never
       annotations:
         enabled: false
         daprEnabled: false