Enable Windows IPAM when creating a Windows nodegroup, deprecate install-vpc-controllers

examples/14-windows-nodes.yaml

@@ -1,5 +1,5 @@
 # An example of ClusterConfig containing Windows and Linux node groups to support Windows workloads
-# This example should be run with `eksctl create cluster -f 14-windows-nodes.yaml --install-vpc-controllers`
+# This example should be run with `eksctl create cluster -f 14-windows-nodes.yaml`
 ---
 apiVersion: eksctl.io/v1alpha5
 kind: ClusterConfig
@@ -13,6 +13,8 @@ nodeGroups:
     amiFamily: WindowsServer2019FullContainer
     minSize: 2
     maxSize: 3
+
+managedNodeGroups:
   - name: linux-ng
     instanceType: t2.large
     minSize: 2

integration/tests/windows/windows_test.go

@@ -70,7 +70,6 @@ var _ = Describe("(Integration) [Windows Nodegroups]", func() {
 				"--config-file", "-",
 				"--verbose", "4",
 				"--kubeconfig", params.KubeconfigPath,
-				"--install-vpc-controllers",
 			).
 			WithoutArg("--region", params.Region).
 			WithStdin(bytes.NewReader(data))

pkg/actions/nodegroup/create.go

@@ -160,6 +160,15 @@ func (m *Manager) nodeCreationTasks(options CreateOpts, nodegroupFilter filter.N
 		taskTree.Append(m.stackManager.NewClusterCompatTask())
 	}
 
+	if m.cfg.HasWindowsNodeGroup() {
+		taskTree.Append(&eks.WindowsIPAMTask{
+			Info: "enable Windows IPAM",
+			ClientsetFunc: func() (kubernetes.Interface, error) {
+				return m.ctl.NewStdClientSet(m.cfg)
+			},
+		})
+	}
+
 	awsNodeUsesIRSA, err := init.DoesAWSNodeUseIRSA(m.ctl.Provider, m.clientSet)
 	if err != nil {
 		return errors.Wrap(err, "couldn't check aws-node for annotation")

pkg/addons/assets/vpc-controller-metadata.yaml

@@ -0,0 +1,52 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: vpc-admission-webhook
+  namespace: kube-system
+
+---
+apiVersion: admissionregistration.k8s.io/v1beta1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: vpc-admission-webhook-cfg
+  namespace: kube-system
+
+---
+apiVersion: certificates.k8s.io/v1beta1
+kind: CertificateSigningRequest
+metadata:
+  name: vpc-admission-webhook.kube-system
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: vpc-admission-webhook
+  namespace: kube-system
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: vpc-resource-controller
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: vpc-resource-controller
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: vpc-resource-controller
+  namespace: kube-system
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: vpc-admission-webhook-certs
+  namespace: kube-system

pkg/addons/device_plugin.go

@@ -71,6 +71,15 @@ type DevicePlugin interface {
 	Deploy() error
 }
 
+type typeAssertionError struct {
+	expected interface{}
+	got      interface{}
+}
+
+func (t *typeAssertionError) Error() string {
+	return fmt.Sprintf("expected type to be %T; got %T", t.expected, t.got)
+}
+
 func applyDevicePlugin(dp DevicePlugin) error {
 	list, err := kubernetes.NewList(dp.Manifest())
 	if err != nil {