fix(helm): config file for api (#4131)

config file for api and remove volume for µservice elasticsearch improve some logs for debugging Signed-off-by: Yvonnick Esnault <[email protected]>
ovh · Apr 2, 2019 · acae6b2 · acae6b2
1 parent a7cc952
commit acae6b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/contrib/helm/cds/templates/api-deployment.yaml b/contrib/helm/cds/templates/api-deployment.yaml
@@ -25,6 +25,11 @@ spec:
         image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         env:
+        - name: CDS_CONFIG_FILE
+          valueFrom:
+            secretKeyRef:
+              name: {{ template "cds.fullname" . }}
+              key: cds_config_file
         - name: CDS_API_DATABASE_HOST
         {{- if .Values.postgresql.enabled }}
           value: {{ template "cds.postgresql.fullname" . }}
@@ -74,7 +79,7 @@ spec:
               name: {{ template "cds.fullname" . }}
               key: cds-api_secrets_key
         command: ["/bin/sh"]
-        args: ["-c", "/app/cds-engine-linux-amd64 start api"]
+        args: ["-c", "echo $CDS_CONFIG_FILE | base64 --decode -o config.toml && /app/cds-engine-linux-amd64 start api --config config.toml"]
         ports:
         - name: http
           containerPort: 8081

diff --git a/contrib/helm/cds/templates/elasticsearch-deployment.yaml b/contrib/helm/cds/templates/elasticsearch-deployment.yaml
@@ -62,10 +62,3 @@ spec:
         ports:
         - name: http
           containerPort: 8084
-          volumeMounts:
-          - name: cds-repos-data
-            mountPath: {{ .Values.repositories.persistence.mountPath }}
-    volumes:
-    - name: cds-repos-data
-      persistentVolumeClaim:
-        claimName: {{ (printf "%s-elasticsearch" (include "cds.fullname" .)) }}
diff --git a/...ib/helm/cds/templates/ui-deployement.yaml → ...rib/helm/cds/templates/ui-deployment.yaml b/...ib/helm/cds/templates/ui-deployement.yaml → ...rib/helm/cds/templates/ui-deployment.yaml
diff --git a/engine/api/api.go b/engine/api/api.go
@@ -300,7 +300,7 @@ func (a *API) CheckConfiguration(config interface{}) error {
 	}
 
 	if aConfig.Directories.Download == "" {
-		return fmt.Errorf("Invalid download directory")
+		return fmt.Errorf("Invalid download directory (empty)")
 	}
 
 	if ok, err := DirectoryExists(aConfig.Directories.Download); !ok {
@@ -309,7 +309,7 @@ func (a *API) CheckConfiguration(config interface{}) error {
 		}
 		log.Info("Directory %s has been created", aConfig.Directories.Download)
 	} else if err != nil {
-		return fmt.Errorf("Invalid download directory: %v", err)
+		return fmt.Errorf("Invalid download directory %s: %v", aConfig.Directories.Download, err)
 	}
 
 	if aConfig.Directories.Keys == "" {
@@ -333,15 +333,15 @@ func (a *API) CheckConfiguration(config interface{}) error {
 
 	if aConfig.Artifact.Mode == "local" {
 		if aConfig.Artifact.Local.BaseDirectory == "" {
-			return fmt.Errorf("Invalid artifact local base directory")
+			return fmt.Errorf("Invalid artifact local base directory (empty name)")
 		}
 		if ok, err := DirectoryExists(aConfig.Artifact.Local.BaseDirectory); !ok {
 			if err := os.MkdirAll(aConfig.Artifact.Local.BaseDirectory, os.FileMode(0700)); err != nil {
 				return fmt.Errorf("Unable to create directory %s: %v", aConfig.Artifact.Local.BaseDirectory, err)
 			}
 			log.Info("Directory %s has been created", aConfig.Artifact.Local.BaseDirectory)
 		} else if err != nil {
-			return fmt.Errorf("Invalid artifact local base directory: %v", err)
+			return fmt.Errorf("Invalid artifact local base directory %s: %v", aConfig.Artifact.Local.BaseDirectory, err)
 		}
 	}