Fixes, persistant storage, better script storage

Author: etoensfeldt

charts/opc-router/templates/_scripts.tpl

@@ -0,0 +1,26 @@
+{{/*
+Commands to setup ssh authentification for the project repo
+*/}} 
+{{- define "project.ssh" }}
+  {{- if (or $.Values.project.auth.ssh_key $.Values.project.auth.ssh_secret) }}
+  cd ~;
+  mkdir .ssh;
+  cd .ssh;
+  ssh -o StrictHostKeyChecking=no {{ regexFind "[@\\/][^:\\/]*[\\/:]" $.Values.project.projectRepo | trimPrefix "\\/" | trimPrefix "@" | trimSuffix "\\/" | trimSuffix ":"}};
+  echo -e $PROJECT_SSH_KEY > id;
+  chmod 400 id;
+  eval `ssh-agent`;
+  ssh-add id;
+  {{- end }}
+{{- end }}
+
+{{/*
+Commands to clone the project repo
+*/}} 
+{{- define "project.clone" }}
+  {{- include "project.ssh" $}}  
+  rm -rf /data/project;
+  mkdir -p /data/project;
+  git clone {{ .Values.project.projectRepo }} /data/project;
+  echo Done;
+{{- end }}

charts/opc-router/templates/deployment.yaml

@@ -53,13 +53,6 @@ spec:
           {{- end }}
           - name: OR_I_ACCEPT_EULA
             value: {{ .Values.I_do_accept_the_EULA | quote }}
-          {{- if (or .Values.project.auth.ssh_key .Values.project.auth.ssh_secret) }}
-          - name: PROJECT_SSH_KEY
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.project.auth.ssh_secret | default (printf "%s-%s" (include "opc-router.fullname" $) "secret" | trunc 63 | trimSuffix "-") }}
-                key: project-ssh-key
-          {{- end }}
           # Loading environment variables specified in the values file
           {{- range .Values.EnvVars }}
           - name: "{{ keys . | first }}"
@@ -71,21 +64,35 @@ spec:
           {{- if .Values.project.projectRepo }}
           # Volume mount for the project and configuration file
           volumeMounts:
-          - mountPath: /project
+          - mountPath: /data
             name: project-volume
           # Command and arguments for loading the project and configuration into the opcrouter
           command: ["/init", "dotnet", "/app/inray.OPCRouter.Service.dll", "import-project"]
-          args: ["--source","/project/{{ .Values.project.projectPath }}",{{ if eq .Values.image.repository "opcrouter/runtime" }}"--configdb","OPCRouterRuntime",{{ end }}"--allow-clear-config","--start-service"{{ if .Values.project.configPath }},"--runtime-configuration-filepath","/project/{{ .Values.project.configPath }}"{{ end }}]
-            
+          args: 
+            - "--source"
+            - "/data/project/{{ .Values.project.projectPath }}"
+            {{- if eq .Values.image.repository "opcrouter/runtime" }}
+            - "--configdb"
+            - "OPCRouterRuntime"
+            {{- end }}
+            - "--allow-clear-config"
+            - "--start-service"
+            {{- if .Values.project.configPath }}
+            - "--runtime-configuration-filepath"
+            - "/data/project/{{ .Values.project.configPath }}"
+            {{- end }}
       # Init container for pulling the project files
       initContainers:
       - name: pull-project
         image: alpine/git:latest
         # Script for setting ssh credentials and cloning the repository onto the volume
-        command: ['sh', '-c', "{{ if .Values.project.auth.ssh_key }}mkdir .ssh; cd .ssh; echo -e $PROJECT_SSH_KEY > id; chmod 400 id; eval `ssh-agent`; ssh-add id; ssh -o 'StrictHostKeyChecking=no' *; {{ end }}cd /project; git clone {{ .Values.project.projectRepo }} .; echo Done"]
+        command: ["sh", "-c"]
+        args:
+          - >-
+          {{- include "project.clone" $ | indent 10}}
         # Volume mount for the project and configuration file
         volumeMounts:
-        - mountPath: /project
+        - mountPath: /data
           name: project-volume
         {{- if (or .Values.project.auth.ssh_key .Values.project.auth.ssh_secret) }}
         env: