small fixes

sancyx · sancyx · commit c1ad31a830e5 · 2021-08-25T21:08:27.000+03:00
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/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.")
 		}

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (a UpdateNodeGroupActivity) Execute(ctx context.Context, input UpdateNodeGr`
`117`	`117`	`nodeVolumeStorage := input.NodeVolumes.InstanceRoot.Storage`
`118`	`118`	`nodeVolumeEncryptionEnabled := ""`
`119`	`119`	`nodeVolumeEncryptionKeyARN := ""`
`120`		`- nodeVolumeType := ""`
	`120`	`+ nodeVolumeType := "gp3"`
`121`	`121`	`nodeVolumeSize := 0`
`122`	`122`
`123`	`123`	`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`
`141`	`141`	`nodeVolumeEncryptionKeyARN = a.defaultNodeVolumeEncryption.EncryptionKeyARN`
`142`	`142`	`}`
`143`	`143`
`144`		`- nodeVolumeType = "gp3"`
`145`	`144`	`if input.NodeVolumes.InstanceRoot.Type != "" {`
`146`	`145`	`nodeVolumeType = input.NodeVolumes.InstanceRoot.Type`
`147`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (n NewNodePool) Validate() error {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if n.Volumes.KubeletRoot != nil &&`
`92`		`- EBS_STORAGE != n.Volumes.KubeletRoot.Storage && INSTANCE_STORE_STORAGE != n.Volumes.KubeletRoot.Storage \|\|`
	`92`	`+ EBS_STORAGE != n.Volumes.KubeletRoot.Storage && INSTANCE_STORE_STORAGE != n.Volumes.KubeletRoot.Storage &&`
`93`	`93`	`NONE_STORAGE != n.Volumes.KubeletRoot.Storage {`
`94`	`94`	violations = append(violations, "Invalid value specified in `volumes.kubeletRoot.storage`. Valid values are: ebs, instance-storage, none.")
`95`	`95`	`}`