Add missing defaulting logic and generated code

eksctl-io · Mar 22, 2019 · 42b63f4 · 42b63f4
1 parent 74649b0
commit 42b63f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/pkg/apis/eksctl.io/v1alpha4/types.go b/pkg/apis/eksctl.io/v1alpha4/types.go
@@ -312,6 +312,7 @@ func (c *ClusterConfig) NewNodeGroup() *NodeGroup {
 				AutoScaler:   NewBoolFalse(),
 				ExternalDNS:  NewBoolFalse(),
 				AppMesh:      NewBoolFalse(),
+				EBSCSI:       NewBoolFalse(),
 			},
 		},
 	}

diff --git a/pkg/apis/eksctl.io/v1alpha4/validation.go b/pkg/apis/eksctl.io/v1alpha4/validation.go
@@ -28,6 +28,9 @@ func validateNodeGroupIAM(i int, ng *NodeGroup, value, fieldName, path string) e
 		if v := ng.IAM.WithAddonPolicies.AppMesh; v != nil && *v {
 			return fmt.Errorf("%s.AppMesh cannot be set at the same time", p)
 		}
+		if v := ng.IAM.WithAddonPolicies.EBSCSI; v != nil && *v {
+			return fmt.Errorf("%s.ebsCSI cannot be set at the same time", p)
+		}
 	}
 	return nil
 }

diff --git a/pkg/apis/eksctl.io/v1alpha4/zz_generated.deepcopy.go b/pkg/apis/eksctl.io/v1alpha4/zz_generated.deepcopy.go
diff --git a/pkg/cfn/builder/api_test.go b/pkg/cfn/builder/api_test.go
@@ -342,6 +342,7 @@ var _ = Describe("CloudFormation template builder API", func() {
 							AutoScaler:   api.NewBoolFalse(),
 							ExternalDNS:  api.NewBoolFalse(),
 							AppMesh:      api.NewBoolFalse(),
+							EBSCSI:       api.NewBoolFalse(),
 						},
 					},
 				},