Merge pull request #10346 from hakman/automated-cherry-pick-of-#10345…

…-upstream-release-1.19 Automated cherry pick of #10345: Alloq using gp3 for root volumes
kubernetes · Dec 2, 2020 · d720d34 · d720d34
2 parents 2c5261d + 40f9e3f
commit d720d34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/apis/kops/validation/instancegroup.go b/pkg/apis/kops/validation/instancegroup.go
@@ -196,7 +196,7 @@ func CrossValidateInstanceGroup(g *kops.InstanceGroup, cluster *kops.Cluster, cl
 	}
 
 	if g.Spec.RootVolumeType != nil && kops.CloudProviderID(cluster.Spec.CloudProvider) == kops.CloudProviderAWS {
-		allErrs = append(allErrs, IsValidValue(field.NewPath("spec", "rootVolumeType"), g.Spec.RootVolumeType, []string{"standard", "gp2", "io1", "io2"})...)
+		allErrs = append(allErrs, IsValidValue(field.NewPath("spec", "rootVolumeType"), g.Spec.RootVolumeType, []string{"standard", "gp3", "gp2", "io1", "io2"})...)
 	}
 
 	return allErrs

diff --git a/pkg/apis/kops/validation/instancegroup_test.go b/pkg/apis/kops/validation/instancegroup_test.go
@@ -196,6 +196,9 @@ func TestValidBootDevice(t *testing.T) {
 		{
 			volumeType: "standard",
 		},
+		{
+			volumeType: "gp3",
+		},
 		{
 			volumeType: "gp2",
 		},