Merge pull request #3142 from shivi28/release-0.7-capi

Bump CAPI to v0.4.7

go.mod

@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws
 
 go 1.16
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.3
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.7
 
 require (
 	github.com/apparentlymart/go-cidr v1.1.0
@@ -36,8 +36,8 @@ require (
 	k8s.io/klog/v2 v2.10.0
 	k8s.io/utils v0.0.0-20210802155522-efc7438f0176
 	sigs.k8s.io/aws-iam-authenticator v0.5.3
-	sigs.k8s.io/cluster-api v0.4.3
-	sigs.k8s.io/cluster-api/test v0.4.3
+	sigs.k8s.io/cluster-api v0.4.7
+	sigs.k8s.io/cluster-api/test v0.4.7
 	sigs.k8s.io/controller-runtime v0.9.7
 	sigs.k8s.io/yaml v1.2.0
 )

go.sum

@@ -1593,10 +1593,10 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/aws-iam-authenticator v0.5.3 h1:EyqQ/uxzbe2mDETZZmuMnv0xHITnyLhZfPlGb6Mma20=
 sigs.k8s.io/aws-iam-authenticator v0.5.3/go.mod h1:DIq7gy0lvnyaG88AgFyJzUVeix+ia5msHEp4RL0102I=
-sigs.k8s.io/cluster-api v0.4.3 h1:bQl0jnVfOa4AW6gUOh5f0QaTv5im7JZwUesbhf/3a0w=
-sigs.k8s.io/cluster-api v0.4.3/go.mod h1:KKycu4yJEm1sxKG5UaHX9ZnYxRiBzJsFjJVmvMQUP2k=
-sigs.k8s.io/cluster-api/test v0.4.3 h1:fr/FztAyF8Ki+frvg5foLUBgp/fpO90tT1BHiQD6HMI=
-sigs.k8s.io/cluster-api/test v0.4.3/go.mod h1:QSthG8w6jaeNE9hwDxntAspluG8xPJFzi1ptSGoNNbw=
+sigs.k8s.io/cluster-api v0.4.7 h1:XzIn48gZAEDyxP/fMcGqOfrgMSLwbcUMgyPRqMeZTjs=
+sigs.k8s.io/cluster-api v0.4.7/go.mod h1:KKycu4yJEm1sxKG5UaHX9ZnYxRiBzJsFjJVmvMQUP2k=
+sigs.k8s.io/cluster-api/test v0.4.7 h1:v+CNc+nW4lolK+mHdnUvQheSbiR6kcbA/8dKgu2VALI=
+sigs.k8s.io/cluster-api/test v0.4.7/go.mod h1:QSthG8w6jaeNE9hwDxntAspluG8xPJFzi1ptSGoNNbw=
 sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
 sigs.k8s.io/controller-runtime v0.9.7 h1:DlHMlAyLpgEITVvNsuZqMbf8/sJl9HirmCZIeR5H9mQ=
 sigs.k8s.io/controller-runtime v0.9.7/go.mod h1:nExcHcQ2zvLMeoO9K7rOesGCmgu32srN5SENvpAEbGA=

test/e2e/data/e2e_conf.yaml

@@ -25,21 +25,21 @@ images:
     loadBehavior: tryLoad
   - name: quay.io/jetstack/cert-manager-controller:v1.1.0
     loadBehavior: tryLoad
-  - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v0.4.1
+  - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v0.4.7
     loadBehavior: tryLoad
-  - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v0.4.1
+  - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v0.4.7
     loadBehavior: tryLoad
-  - name: k8s.gcr.io/cluster-api/cluster-api-controller:v0.4.1
+  - name: k8s.gcr.io/cluster-api/cluster-api-controller:v0.4.7
     loadBehavior: tryLoad
 
 providers:
 
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v0.4.1
+      - name: v0.4.7
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.1/core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/core-components.yaml"
         type: "url"
         files:
           - sourcePath: "./shared/v1alpha4/metadata.yaml"
@@ -56,9 +56,9 @@ providers:
     files:
       - sourcePath: "./shared/v1alpha4/metadata.yaml"
     versions:
-      - name: v0.4.1
+      - name: v0.4.7
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.1/bootstrap-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/bootstrap-components.yaml"
         type: "url"
         replacements:
           - old: "imagePullPolicy: Always"
@@ -73,9 +73,9 @@ providers:
     files:
       - sourcePath: "./shared/v1alpha4/metadata.yaml"
     versions:
-      - name: v0.4.1
+      - name: v0.4.7
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.1/control-plane-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/control-plane-components.yaml"
         type: "url"
         replacements:
           - old: "imagePullPolicy: Always"

test/e2e/data/e2e_eks_conf.yaml

@@ -25,11 +25,11 @@ images:
     loadBehavior: tryLoad
   - name: quay.io/jetstack/cert-manager-controller:v1.1.0
     loadBehavior: tryLoad
-  - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v0.4.1
+  - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v0.4.7
     loadBehavior: tryLoad
-  - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v0.4.1
+  - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v0.4.7
     loadBehavior: tryLoad
-  - name: k8s.gcr.io/cluster-api/cluster-api-controller:v0.4.1
+  - name: k8s.gcr.io/cluster-api/cluster-api-controller:v0.4.7
     loadBehavior: tryLoad
 
 
@@ -38,9 +38,9 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v0.4.1
+      - name: v0.4.7
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.1/core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/core-components.yaml"
         type: "url"
         files:
           - sourcePath: "./shared/v1alpha4/metadata.yaml"