dind-volumes - working draft

Author: kosta709

venonactl/pkg/codefresh/cfapi.go

@@ -178,10 +178,11 @@ func (a *api) Register() (*codefresh.RuntimeEnvironment, error) {
 		options.NodeSelector = a.buildNodeSelector
 	}
 
-	options.StorageClass = fmt.Sprintf("%s-%s", a.storageClass, a.clusternamespace)
-	if !a.isDefaultStorageClass {
-		options.StorageClass = a.storageClass
-	}
+	// options.StorageClass = fmt.Sprintf("%s-%s", a.storageClass, a.clusternamespace)
+	// if !a.isDefaultStorageClass {
+	// 	options.StorageClass = a.storageClass
+	// }
+	options.StorageClass = a.storageClass
 
 	if len(a.annotations) != 0 {
 		options.Annotations = a.annotations

venonactl/pkg/plugins/runtime-environment.go

@@ -58,15 +58,16 @@ func (u *runtimeEnvironmentPlugin) Install(opt *InstallOptions, v Values) (Value
 
 	// Set storage Class by backend
 	if cfOpt.IsDefaultStorageClass {
-		if storageBackend, storageBackendParamsSet := v["Storage"].(map[string]interface{})["Backend"]; storageBackendParamsSet {
+		storageParams := v["Storage"].(map[string]interface{})
+		if storageBackend, storageBackendParamsSet := storageParams["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"])
+				cfOpt.StorageClass = fmt.Sprintf("dind-gcedisk-%s-%s-%s", storageParams["AvailabilityZone"], v["AppName"], v["Namespace"])
 			case "ebs":
-				cfOpt.StorageClass = fmt.Sprintf("dind-ebs-%s-%s-%s", v["AvailabilityZone"], v["AppName"], v["Namespace"])
+				cfOpt.StorageClass = fmt.Sprintf("dind-ebs-%s-%s-%s", storageParams["AvailabilityZone"], v["AppName"], v["Namespace"])
 			}
 		}
 	}

venonactl/pkg/templates/kubernetes/deployment.dind-volume-provisioner.vp.yaml

@@ -31,12 +31,12 @@ spec:
       {{ end }}
       containers:
       - name: dind-volume-provisioner
-        image: {{ .VolumeProvisionerImage.Name }}:{{ .VolumeProvisionerImage.Tag }}
+        image: {{ .Storage.VolumeProvisioner.Image }}
         imagePullPolicy: Always
         resources:
           requests:
-            cpu: "300m"
-            memory: "400Mi"
+            cpu: "200m"
+            memory: "200Mi"
           limits:
             cpu: "1000m"
             memory: "6000Mi"

venonactl/pkg/templates/kubernetes/storageclass.dind-gcedisk.vp.yaml

@@ -6,7 +6,7 @@ metadata:
   name: dind-gcedisk-{{.Storage.AvailabilityZone}}-{{ .AppName }}-{{ .Namespace }}
   labels:
     app: dind-volume-provisioner
-provisioner: codefresh.io/dind-gce-{{ .AppName }}-{{ .Namespace }}
+provisioner: codefresh.io/dind-volume-provisioner-{{ .AppName }}-{{ .Namespace }}
 parameters:
   volumeBackend: {{ .Storage.Backend }}
   #  pd-ssd or pd-standard