small fixes

banzaicloud · Aug 26, 2021 · dd5cd0a · dd5cd0a
1 parent d7bef90
commit dd5cd0a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/internal/cluster/distribution/eks/eksworkflow/activity_update_node_group.go b/internal/cluster/distribution/eks/eksworkflow/activity_update_node_group.go
@@ -117,7 +117,7 @@ func (a UpdateNodeGroupActivity) Execute(ctx context.Context, input UpdateNodeGr
 	nodeVolumeStorage := input.NodeVolumes.InstanceRoot.Storage
 	nodeVolumeEncryptionEnabled := ""
 	nodeVolumeEncryptionKeyARN := ""
-	nodeVolumeType := ""
+	nodeVolumeType := "gp3"
 	nodeVolumeSize := 0
 
 	if input.NodeVolumes.InstanceRoot != nil && eks.EBS_STORAGE == input.NodeVolumes.InstanceRoot.Storage {
@@ -141,7 +141,6 @@ func (a UpdateNodeGroupActivity) Execute(ctx context.Context, input UpdateNodeGr
 			nodeVolumeEncryptionKeyARN = a.defaultNodeVolumeEncryption.EncryptionKeyARN
 		}
 
-		nodeVolumeType = "gp3"
 		if input.NodeVolumes.InstanceRoot.Type != "" {
 			nodeVolumeType = input.NodeVolumes.InstanceRoot.Type
 		}

diff --git a/internal/cluster/distribution/eks/eksworkflow/workflow_update_node_pool.go b/internal/cluster/distribution/eks/eksworkflow/workflow_update_node_pool.go
@@ -186,6 +186,10 @@ func (w UpdateNodePoolWorkflow) Execute(ctx workflow.Context, input UpdateNodePo
 
 		if effectiveVolumes.InstanceRoot.Storage == "" {
 			effectiveVolumes.InstanceRoot.Storage = parameters.NodeVolumeStorage
+			// set default ebs value for InstanceRoot.Storage for old templates
+			if currentTemplateVersion.IsLessThan("2.5.0") {
+				effectiveVolumes.InstanceRoot.Storage = eks.EBS_STORAGE
+			}
 		}
 		// load EBS volume related params only in case storage == ebs
 		if eks.EBS_STORAGE == effectiveVolumes.InstanceRoot.Storage {

diff --git a/internal/cluster/distribution/eks/node_pool.go b/internal/cluster/distribution/eks/node_pool.go
@@ -89,7 +89,7 @@ func (n NewNodePool) Validate() error {
 		}
 
 		if n.Volumes.KubeletRoot != nil &&
-			EBS_STORAGE != n.Volumes.KubeletRoot.Storage && INSTANCE_STORE_STORAGE != n.Volumes.KubeletRoot.Storage ||
+			EBS_STORAGE != n.Volumes.KubeletRoot.Storage && INSTANCE_STORE_STORAGE != n.Volumes.KubeletRoot.Storage &&
 			NONE_STORAGE != n.Volumes.KubeletRoot.Storage {
 			violations = append(violations, "Invalid value specified in `volumes.kubeletRoot.storage`. Valid values are: ebs, instance-storage, none.")
 		}

diff --git a/src/cluster/eks_update_cluster.go b/src/cluster/eks_update_cluster.go
@@ -262,6 +262,10 @@ func (w EKSUpdateClusterWorkflow) Execute(ctx workflow.Context, input EKSUpdateC
 
 				if effectiveVolumes.InstanceRoot.Storage == "" {
 					effectiveVolumes.InstanceRoot.Storage = parameters.NodeVolumeStorage
+					// set default ebs value for InstanceRoot.Storage for old templates
+					if currentTemplateVersion.IsLessThan("2.5.0") {
+						effectiveVolumes.InstanceRoot.Storage = eks.EBS_STORAGE
+					}
 				}
 				// load EBS volume related params only in case storage == ebs
 				if eks.EBS_STORAGE == effectiveVolumes.InstanceRoot.Storage {