Fix VPC cluster templates post CAPI version bump to v1.11.0-beta.0 (kubernetes-sigs#2437)

Author: Amulyam24

templates/bases/vpc/kcp.yaml

@@ -19,9 +19,6 @@ spec:
           value: "true"
       apiServer:
         certSANs: [localhost, 127.0.0.1]
-      dns: {}
-      etcd: {}
-      scheduler: {}
     initConfiguration:
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
@@ -31,7 +28,6 @@ spec:
         - name: eviction-hard
           value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
     joinConfiguration:
-      discovery: {}
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
         kubeletExtraArgs:

templates/cluster-template-vpc-clusterclass.yaml

@@ -96,9 +96,6 @@ spec:
               value: "true"
             - name: cloud-provider
               value: external
-          dns: {}
-          etcd: {}
-          scheduler: {}
         initConfiguration:
           nodeRegistration:
             criSocket: /var/run/containerd/containerd.sock
@@ -108,7 +105,6 @@ spec:
             - name: eviction-hard
               value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
         joinConfiguration:
-          discovery: {}
           nodeRegistration:
             criSocket: /var/run/containerd/containerd.sock
             kubeletExtraArgs:

templates/cluster-template-vpc-clusterclass/cluster-with-kcp.yaml

@@ -94,9 +94,6 @@ spec:
                 value: 'true'
               - name: cloud-provider
                 value: external
-          dns: {}
-          etcd: {}
-          scheduler: {}
         initConfiguration:
           nodeRegistration:
             criSocket: /var/run/containerd/containerd.sock
@@ -106,7 +103,6 @@ spec:
               - name: eviction-hard
                 value: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
-          discovery: {}
           nodeRegistration:
             criSocket: /var/run/containerd/containerd.sock
             kubeletExtraArgs:

templates/cluster-template.yaml

@@ -54,9 +54,6 @@ spec:
         extraArgs:
         - name: cloud-provider
           value: external
-      dns: {}
-      etcd: {}
-      scheduler: {}
     initConfiguration:
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
@@ -66,7 +63,6 @@ spec:
         - name: eviction-hard
           value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
     joinConfiguration:
-      discovery: {}
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
         kubeletExtraArgs:

test/e2e/data/templates/cluster-template-vpc.yaml

@@ -334,9 +334,6 @@ spec:
         extraArgs:
         - name: cloud-provider
           value: external
-      dns: {}
-      etcd: {}
-      scheduler: {}
     initConfiguration:
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
@@ -346,7 +343,6 @@ spec:
         - name: eviction-hard
           value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
     joinConfiguration:
-      discovery: {}
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
         kubeletExtraArgs: