add: --disable-network-policy flag to create cluster (#114)

awslabs · Oct 4, 2023 · b90f977 · b90f977
1 parent 6d9fe82
commit b90f977
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/pkg/resource/cluster/cluster.go b/pkg/resource/cluster/cluster.go
@@ -35,7 +35,7 @@ addons:
 - name: vpc-cni
   version: latest
   configurationValues: |-
-  {{- if eq .KubernetesVersion "1.27" "1.26" "1.25" }}
+  {{- if and (ne .KubernetesVersion "1.24") (not .DisableNetworkPolicy) }}
     enableNetworkPolicy: "true"
   {{- end }}
     env:

diff --git a/pkg/resource/cluster/options.go b/pkg/resource/cluster/options.go
@@ -28,14 +28,15 @@ type ClusterOptions struct {
 	resource.CommonOptions
 	*nodegroup.NodegroupOptions
 
-	Fargate          bool
-	HostnameType     string
-	IPv6             bool
-	Kubeconfig       string
-	NoRoles          bool
-	PrefixAssignment bool
-	Private          bool
-	VpcCidr          string
+	DisableNetworkPolicy bool
+	Fargate              bool
+	HostnameType         string
+	IPv6                 bool
+	Kubeconfig           string
+	NoRoles              bool
+	PrefixAssignment     bool
+	Private              bool
+	VpcCidr              string
 
 	appsForIrsa  []*application.Application
 	IrsaTemplate *template.TextTemplate
@@ -90,6 +91,13 @@ func addOptions(res *resource.Resource) *resource.Resource {
 			Choices: []string{"1.28", "1.27", "1.26", "1.25", "1.24"},
 			Option:  &options.KubernetesVersion,
 		},
+		&cmd.BoolFlag{
+			CommandFlag: cmd.CommandFlag{
+				Name:        "disable-network-policy",
+				Description: "don't enable network policy for Amazon VPC CNI",
+			},
+			Option: &options.DisableNetworkPolicy,
+		},
 		&cmd.BoolFlag{
 			CommandFlag: cmd.CommandFlag{
 				Name:        "fargate",
@@ -135,7 +143,7 @@ func addOptions(res *resource.Resource) *resource.Resource {
 		&cmd.BoolFlag{
 			CommandFlag: cmd.CommandFlag{
 				Name:        "prefix-assignment",
-				Description: "configured VPC CNI for prefix assignment",
+				Description: "configure VPC CNI for prefix assignment",
 			},
 			Option: &options.PrefixAssignment,
 		},