Bump Cluster API to v0.3.22

addons/go.mod

@@ -23,6 +23,6 @@ require (
 	k8s.io/client-go v0.21.2
 	k8s.io/klog v1.0.0
 	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
-	sigs.k8s.io/cluster-api v0.3.22-0.20210720023132-dfeb8d447bdc
+	sigs.k8s.io/cluster-api v0.3.22
 	sigs.k8s.io/controller-runtime v0.7.0
 )

go.mod

@@ -17,9 +17,9 @@ replace (
 require (
 	cloud.google.com/go/storage v1.10.0
 	github.com/AlecAivazis/survey/v2 v2.1.1
-	github.com/Azure/azure-sdk-for-go v46.0.0+incompatible
-	github.com/Azure/go-autorest/autorest v0.11.4
-	github.com/Azure/go-autorest/autorest/azure/auth v0.5.1
+	github.com/Azure/azure-sdk-for-go v48.2.0+incompatible
+	github.com/Azure/go-autorest/autorest v0.11.11
+	github.com/Azure/go-autorest/autorest/azure/auth v0.5.3
 	github.com/Jeffail/gabs v1.4.0
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/Masterminds/semver v1.5.0
@@ -109,13 +109,13 @@ require (
 	k8s.io/client-go v0.21.2
 	k8s.io/cluster-bootstrap v0.21.2 // indirect
 	k8s.io/klog/v2 v2.8.0
-	k8s.io/kubectl v0.17.11
+	k8s.io/kubectl v0.17.14
 	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
-	sigs.k8s.io/cluster-api v0.3.22-0.20210720023132-dfeb8d447bdc
-	sigs.k8s.io/cluster-api-provider-aws v0.6.5-0.20210309190705-ff3ed1b9f6f1
-	sigs.k8s.io/cluster-api-provider-azure v0.4.9-0.20200910212016-5c680a6c2dd4
-	sigs.k8s.io/cluster-api-provider-vsphere v0.7.1
-	sigs.k8s.io/cluster-api/test/infrastructure/docker v0.0.0-20200707192359-e68354f948db
+	sigs.k8s.io/cluster-api v0.3.22
+	sigs.k8s.io/cluster-api-provider-aws v0.6.6
+	sigs.k8s.io/cluster-api-provider-azure v0.4.15
+	sigs.k8s.io/cluster-api-provider-vsphere v0.7.8
+	sigs.k8s.io/cluster-api/test/infrastructure/docker v0.0.0-20210720023132-dfeb8d447bdc
 	sigs.k8s.io/controller-runtime v0.7.0
 	sigs.k8s.io/controller-tools v0.3.0
 	sigs.k8s.io/kind v0.11.1

pkg/v1/providers/bootstrap-kubeadm/v0.3.19/bootstrap-components.yaml → pkg/v1/providers/bootstrap-kubeadm/v0.3.22/bootstrap-components.yaml

@@ -3935,7 +3935,7 @@ spec:
         - --feature-gates=MachinePool=${EXP_MACHINE_POOL:=false}
         command:
         - /manager
-        image: registry.tkg.vmware.run/cluster-api/kubeadm-bootstrap-controller:v0.3.19_vmware.1
+        image: registry.tkg.vmware.run/cluster-api/kubeadm-bootstrap-controller:v0.3.22_vmware.1
         imagePullPolicy: IfNotPresent
         name: manager
       terminationGracePeriodSeconds: 10
@@ -3980,7 +3980,7 @@ spec:
         - --feature-gates=MachinePool=${EXP_MACHINE_POOL:=false}
         command:
         - /manager
-        image: registry.tkg.vmware.run/cluster-api/kubeadm-bootstrap-controller:v0.3.19_vmware.1
+        image: registry.tkg.vmware.run/cluster-api/kubeadm-bootstrap-controller:v0.3.22_vmware.1
         imagePullPolicy: IfNotPresent
         name: manager
         ports:

pkg/v1/providers/cluster-api/v0.3.19/core-components.yaml → pkg/v1/providers/cluster-api/v0.3.22/core-components.yaml

@@ -4845,7 +4845,7 @@ spec:
         - --feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},ClusterResourceSet=true
         command:
         - /manager
-        image: registry.tkg.vmware.run/cluster-api/cluster-api-controller:v0.3.19_vmware.1
+        image: registry.tkg.vmware.run/cluster-api/cluster-api-controller:v0.3.22_vmware.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -4902,7 +4902,7 @@ spec:
         - --feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},ClusterResourceSet=true
         command:
         - /manager
-        image: registry.tkg.vmware.run/cluster-api/cluster-api-controller:v0.3.19_vmware.1
+        image: registry.tkg.vmware.run/cluster-api/cluster-api-controller:v0.3.22_vmware.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

pkg/v1/providers/config.yaml

@@ -1,6 +1,6 @@
 providers:
   - name: cluster-api
-    url: providers/cluster-api/v0.3.19/core-components.yaml
+    url: providers/cluster-api/v0.3.22/core-components.yaml
     type: CoreProvider
   - name: aws
     url: providers/infrastructure-aws/v0.6.6/infrastructure-components.yaml
@@ -18,11 +18,11 @@ providers:
     url: providers/infrastructure-tkg-service-vsphere/v1.0.0/unused.yaml
     type: InfrastructureProvider
   - name: kubeadm
-    url: providers/bootstrap-kubeadm/v0.3.19/bootstrap-components.yaml
+    url: providers/bootstrap-kubeadm/v0.3.22/bootstrap-components.yaml
     type: BootstrapProvider
   - name: kubeadm
-    url: providers/control-plane-kubeadm/v0.3.19/control-plane-components.yaml
+    url: providers/control-plane-kubeadm/v0.3.22/control-plane-components.yaml
     type: ControlPlaneProvider
   - name: docker
-    url: providers/infrastructure-docker/v0.3.19/infrastructure-components.yaml
+    url: providers/infrastructure-docker/v0.3.22/infrastructure-components.yaml
     type: InfrastructureProvider

pkg/v1/providers/control-plane-kubeadm/v0.3.19/control-plane-components.yaml → pkg/v1/providers/control-plane-kubeadm/v0.3.22/control-plane-components.yaml

@@ -1499,7 +1499,7 @@ spec:
         - --enable-leader-election
         command:
         - /manager
-        image: registry.tkg.vmware.run/cluster-api/kubeadm-control-plane-controller:v0.3.19_vmware.1
+        image: registry.tkg.vmware.run/cluster-api/kubeadm-control-plane-controller:v0.3.22_vmware.1
         imagePullPolicy: IfNotPresent
         name: manager
       terminationGracePeriodSeconds: 10
@@ -1543,7 +1543,7 @@ spec:
         - --webhook-port=9443
         command:
         - /manager
-        image: registry.tkg.vmware.run/cluster-api/kubeadm-control-plane-controller:v0.3.19_vmware.1
+        image: registry.tkg.vmware.run/cluster-api/kubeadm-control-plane-controller:v0.3.22_vmware.1
         imagePullPolicy: IfNotPresent
         name: manager
         ports:

pkg/v1/providers/infrastructure-docker/v0.3.19/cluster-template-definition-dev.yaml → pkg/v1/providers/infrastructure-docker/v0.3.22/cluster-template-definition-dev.yaml

@@ -2,7 +2,7 @@ apiVersion: providers.tanzu.vmware.com/v1alpha1
 kind: TemplateDefinition
 spec:
   paths:
-    - path: providers/infrastructure-docker/v0.3.19/ytt
+    - path: providers/infrastructure-docker/v0.3.22/ytt
     - path: providers/infrastructure-docker/ytt
     - path: providers/ytt
     - path: bom

pkg/v1/providers/infrastructure-docker/v0.3.19/cluster-template-definition-prod.yaml → pkg/v1/providers/infrastructure-docker/v0.3.22/cluster-template-definition-prod.yaml

@@ -2,7 +2,7 @@ apiVersion: providers.tanzu.vmware.com/v1alpha1
 kind: TemplateDefinition
 spec:
   paths:
-    - path: providers/infrastructure-docker/v0.3.19/ytt
+    - path: providers/infrastructure-docker/v0.3.22/ytt
     - path: providers/infrastructure-docker/ytt
     - path: providers/ytt
     - path: bom

pkg/v1/providers/infrastructure-docker/v0.3.19/infrastructure-components.yaml → pkg/v1/providers/infrastructure-docker/v0.3.22/infrastructure-components.yaml

@@ -913,7 +913,7 @@ spec:
         - --feature-gates=MachinePool=${EXP_MACHINE_POOL:=false}
         - --metrics-addr=0
         - -v=4
-        image: registry.tkg.vmware.run/cluster-api/capd-manager:v0.3.19_vmware.1
+        image: registry.tkg.vmware.run/cluster-api/capd-manager:v0.3.22_vmware.1
         livenessProbe:
           httpGet:
             path: /healthz