fix: blank config map support (#52)

Signed-off-by: Gosha <[email protected]>
Rookout · Jun 22, 2023 · fc4a4b2 · fc4a4b2
1 parent 36e066f
commit fc4a4b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml
@@ -21,12 +21,14 @@ spec:
       labels:
         {{- include "piper.selectorLabels" . | nindent 8 }}
         app: {{ .Chart.Name | trunc 63 | trimSuffix "-" }}
-        version: {{ .Values.image.tag | trunc 63 | trimSuffix "-" }}
+        version: {{ .Values.image.tag | default .Chart.AppVersion | trunc 63 | trimSuffix "-" }}
     spec:
       volumes:
+      {{- if .Values.piper.workflowsConfig }}
       - name: piper-workflows-config
         configMap:
           name: piper-workflows-config
+      {{- end }}
       {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -40,9 +42,11 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           volumeMounts:
+          {{- if .Values.piper.workflowsConfig }}
           - mountPath: /piper-config
             name: piper-workflows-config
             readOnly: true
+          {{- end }}
           {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}

diff --git a/pkg/conf/workflows_config.go b/pkg/conf/workflows_config.go
@@ -2,6 +2,7 @@ package conf
 
 import (
 	"encoding/json"
+	"log"
 
 	"github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
 	"github.com/rookout/piper/pkg/utils"
@@ -21,6 +22,10 @@ func (wfc *WorkflowsConfig) WorkflowsSpecLoad(configPath string) error {
 	wfc.Configs = make(map[string]*ConfigInstance)
 
 	configs, err := utils.GetFilesData(configPath)
+	if len(configs) == 0 {
+		log.Printf("No config files to load at %s", configPath)
+		return nil
+	}
 	if err != nil {
 		return err
 	}