added dind-storage - draft1

Author: kosta709

README.md

@@ -47,7 +47,7 @@
 | --skip-runtime-installation | boolean | Set flag if you already have a configured runtime-environment, add --runtime-environment flag with name |
 | --storage-class | string | Set a name of your custom storage class, note: this will not install volume provisioning components |
 | --tolerations | string | The kubernetes tolerations as JSON string to be used by venona resources (default is no tolerations). If prefixed with "@", loads from a file: @/tmp/tolerations.json |
-| --set-value | stringArray | Set values for templates, example: --set-value LocalVolumeDir=/mnt/disk/ssd0/codefresh-volumes |
+| --set-value | stringArray | Set values for templates, example: --set-value Storage.LocalVolumeParentDir=/mnt/disk/ssd0/codefresh-volumes |
 | --venona-version | string | Version of venona to install (default is the latest) |
 
 #### Install on cluster version < 1.10

venonactl/cmd/install.go

@@ -207,9 +207,8 @@ var installCmd = &cobra.Command{
 				dieOnError(fmt.Errorf("Cannot parse option --set-value %s", value))
 			}
 		}
-		for k, v := range base {
-			values[k] = v
-		}
+
+		values = mergeMaps(values, base)
 
 		for _, p := range builder.Get() {
 			values, err = p.Install(builderInstallOpt, values)
@@ -221,6 +220,25 @@ var installCmd = &cobra.Command{
 	},
 }
 
+func mergeMaps(a, b map[string]interface{}) map[string]interface{} {
+	out := make(map[string]interface{}, len(a))
+	for k, v := range a {
+		out[k] = v
+	}
+	for k, v := range b {
+		if v, ok := v.(map[string]interface{}); ok {
+			if bv, ok := out[k]; ok {
+				if bv, ok := bv.(map[string]interface{}); ok {
+					out[k] = mergeMaps(bv, v)
+					continue
+				}
+			}
+		}
+		out[k] = v
+	}
+	return out
+}
+
 func init() {
 	rootCmd.AddCommand(installCmd)
 

venonactl/go.sum

@@ -647,8 +647,10 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+helm.sh/helm v2.16.3+incompatible h1:a7P7FSGTBdK6ZsAcWWZZQXPIdzkgybD8CWd/Dy+jwf4=
 helm.sh/helm/v3 v3.1.1 h1:aykwPMVyQyncZ8iLNVMXgJ1l3c6W0+LSOPmqp8JdCjs=
 helm.sh/helm/v3 v3.1.1/go.mod h1:WYsFJuMASa/4XUqLyv54s0U/f3mlAaRErGmyy4z921g=
+helm.sh/helm/v3 v3.1.2 h1:VpNzaNv2DX4aRnOCcV7v5Of+XT2SZrJ8iOQ25AGKOos=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -659,6 +661,7 @@ k8s.io/apiextensions-apiserver v0.17.2/go.mod h1:4KdMpjkEjjDI2pPfBA15OscyNldHWdB
 k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
 k8s.io/apimachinery v0.17.3 h1:f+uZV6rm4/tHE7xXgLyToprg6xWairaClGVkm2t8omg=
 k8s.io/apimachinery v0.17.3/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
+k8s.io/apimachinery v0.17.4 h1:UzM+38cPUJnzqSQ+E1PY4YxMHIzQyCg29LOoGfo79Zw=
 k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo=
 k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI=
 k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI=

venonactl/pkg/obj/kubeobj/kubeobj.go

@@ -59,6 +59,9 @@ var functionsMap map[string]string = map[string]string{
 	"rbacv1.RoleBinding":        "RbacV1().RoleBindings(namespace)",
 
 	"storagev1.StorageClass": "StorageV1().StorageClasses()",
+
+	"batchv1.Job":     "BatchV1().Jobs(namespace)",
+	"batchv1beta1.CronJob": "BatchV1beta1().CronJobs(namespace)",
 }
 
 var packageTemplate = template.Must(template.New("").Parse(
@@ -81,6 +84,9 @@ import (
     rbacv1 "k8s.io/api/rbac/v1"
 
 	storagev1 "k8s.io/api/storage/v1"
+
+	batchv1 "k8s.io/api/batch/v1"
+	batchv1beta1 "k8s.io/api/batch/v1beta1"
 )
 
 // CreateObject - creates kubernetes object from *runtime.Object. Returns object name, kind and creation error

venonactl/pkg/obj/kubeobj_generator.go

@@ -53,6 +53,7 @@ func ExecuteTemplate(tplStr string, data interface{}) (string, error) {
 // ParseTemplates - parses and exexute templates and return map of strings with obj data
 func ParseTemplates(templatesMap map[string]string, data interface{}, pattern string, logger logger.Logger) (map[string]string, error) {
 	parsedTemplates := make(map[string]string)
+	nonEmptyParsedTemplateFunc := regexp.MustCompile(`[a-zA-Z0-9]`).MatchString
 	for n, tpl := range templatesMap {
 		match, _ := regexp.MatchString(pattern, n)
 		if match != true {
@@ -65,7 +66,12 @@ func ParseTemplates(templatesMap map[string]string, data interface{}, pattern st
 			logger.Error("Failed to parse and execute template", "Name", n)
 			return nil, err
 		}
-		parsedTemplates[n] = tplEx
+
+		// we add only non-empty parsedTemplates
+		if nonEmptyParsedTemplateFunc(tplEx) {
+			parsedTemplates[n] = tplEx
+		}
+		
 	}
 	return parsedTemplates, nil
 }

venonactl/pkg/plugins/helper.go

@@ -56,6 +56,21 @@ func (u *runtimeEnvironmentPlugin) Install(opt *InstallOptions, v Values) (Value
 		Annotations:           opt.Annotations,
 	}
 
+	// Set storage Class by backend
+	if cfOpt.IsDefaultStorageClass {
+		if storageBackend, storageBackendParamsSet := v["Storage"].(map[string]interface{})["Backend"]; storageBackendParamsSet {
+
+			switch storageBackend {
+			case "local":
+				cfOpt.StorageClass = fmt.Sprintf("dind-local-volumes-%s-%s", v["AppName"], v["Namespace"])
+			case "gcedisk":
+				cfOpt.StorageClass = fmt.Sprintf("dind-gcedisk-%s-%s-%s", v["AvailabilityZone"], v["AppName"], v["Namespace"])
+			case "ebs":
+				cfOpt.StorageClass = fmt.Sprintf("dind-ebs-%s-%s-%s", v["AvailabilityZone"], v["AppName"], v["Namespace"])
+			}
+		}
+	}
+
 	cf := codefresh.NewCodefreshAPI(cfOpt)
 	cert, err := cf.Sign()
 	if err != nil {

venonactl/pkg/plugins/runtime-environment.go

@@ -108,5 +108,16 @@ func (s *Values) BuildValues() map[string]interface{} {
 			"Key":  "",
 			"Ca":   "",
 		},
+		"Storage": map[string]interface{}{
+			"Backend": "local",
+			"LocalVolumeParentDir": "/var/lib/codefresh/dind-volumes",
+			"AvailabilityZone": "",
+			"GoogleServiceAccount": "",
+			"VolumeProvisioner": map[string]interface{}{
+				"Image": "codefresh/dind-volume-provisioner:v20",
+				"NodeSelector": s.KubernetesAPI.NodeSelector,
+				"Tolerations":  s.KubernetesAPI.Tolerations,
+			},
+		},
 	}
 }

venonactl/pkg/store/store.go

@@ -0,0 +1,21 @@
+{{- if not (eq .Storage.Backend "local") }}
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: dind-volume-cleanup-{{ .AppName }}
+  namespace: {{ .Namespace }}
+  labels:
+    app: dind-volume-cleanup
+spec:
+  schedule: "0,10,20,30,40,50 * * * *"
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: volume-provisioner-{{ .AppName }}
+          restartPolicy: Never
+          containers:
+            - name: dind-volume-cleanup
+              image: codefresh/dind-volume-cleanup
+{{- end }}

venonactl/pkg/templates/kubernetes/cron-job.dind-volume-cleanup.vp.yaml

@@ -1,3 +1,5 @@
+{{- if eq .Storage.Backend "local" -}}
+{{- $localVolumeParentDir := ( .Storage.LocalVolumeParentDir | default "/var/lib/codefresh/dind-volumes" ) }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -45,7 +47,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
             - name: VOLUME_PARENT_DIR
-              value: {{ .LocalVolumeDir | default "/var/lib/codefresh/dind-volumes" }}
+              value: {{ $localVolumeParentDir }}
 #              Debug:
 #            - name: DRY_RUN
 #              value: "1"
@@ -59,10 +61,11 @@ spec:
 #              value: "20"
 
           volumeMounts:
-          - mountPath: /var/lib/codefresh/dind-volumes
+          - mountPath: {{ $localVolumeParentDir }}
             readOnly: false
             name: dind-volume-dir
       volumes:
       - name: dind-volume-dir
         hostPath:
-          path: /var/lib/codefresh/dind-volumes
+          path: {{ $localVolumeParentDir }}
+{{- end -}}