Merge pull request #4372 from Ankitasw/capi-bump

Bump CAPI to v1.4.4

Author: k8s-ci-robot

go.mod

@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws/v2
 
 go 1.19
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.3
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.4
 
 require (
 	github.com/alessio/shellescape v1.4.1
@@ -38,8 +38,8 @@ require (
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
 	sigs.k8s.io/aws-iam-authenticator v0.6.10
-	sigs.k8s.io/cluster-api v1.4.3
-	sigs.k8s.io/cluster-api/test v1.4.3
+	sigs.k8s.io/cluster-api v1.4.4
+	sigs.k8s.io/cluster-api/test v1.4.4
 	sigs.k8s.io/controller-runtime v0.14.6
 	sigs.k8s.io/kustomize/api v0.13.4
 	sigs.k8s.io/yaml v1.3.0
@@ -159,7 +159,7 @@ require (
 	k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
 	k8s.io/kubectl v0.26.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kind v0.18.0 // indirect
+	sigs.k8s.io/kind v0.20.0 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )

go.sum

@@ -1027,16 +1027,16 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/aws-iam-authenticator v0.6.10 h1:ld4g1kQUAG9jgUUc0e4cRPhRXTvzp0/uw5M6iSYskpY=
 sigs.k8s.io/aws-iam-authenticator v0.6.10/go.mod h1:uh/d/yhtzJXBdevntKgTKRaabgD2T/JI/YdV+9IaycE=
-sigs.k8s.io/cluster-api v1.4.3 h1:QSeKr3qnWPtVp+EMQZQduKoi5WDwUhAtBRreEukkcy0=
-sigs.k8s.io/cluster-api v1.4.3/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
-sigs.k8s.io/cluster-api/test v1.4.3 h1:xXhvOLp5zBKn2Yf4PQckFwxGxFrKgkgUI74ikU5Jh/c=
-sigs.k8s.io/cluster-api/test v1.4.3/go.mod h1:xGTJsJkbXMNmumhErEAH/e7GmnE2sGfm/rcOzJZSdbw=
+sigs.k8s.io/cluster-api v1.4.4 h1:+V+mzDe+gsWYclosvWlH0wadC8vIUsBvZLcWOYnVWRA=
+sigs.k8s.io/cluster-api v1.4.4/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
+sigs.k8s.io/cluster-api/test v1.4.4 h1:EhZqbMJ9uY0mptUnSax44FzaScphtCU91LxJq0qfCrI=
+sigs.k8s.io/cluster-api/test v1.4.4/go.mod h1:wF8xhW4V0D+Gfrm5uZk57I0up+8WUQNpB2dNTJ1aTiI=
 sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA=
 sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/kind v0.18.0 h1:ahgZdVV1pdhXlYe1f+ztISakT23KdrBl/NFY9JMygzs=
-sigs.k8s.io/kind v0.18.0/go.mod h1:Qqp8AiwOlMZmJWs37Hgs31xcbiYXjtXlRBSftcnZXQk=
+sigs.k8s.io/kind v0.20.0 h1:f0sc3v9mQbGnjBUaqSFST1dwIuiikKVGgoTwpoP33a8=
+sigs.k8s.io/kind v0.20.0/go.mod h1:aBlbxg08cauDgZ612shr017/rZwqd7AS563FvpWKPVs=
 sigs.k8s.io/kustomize/api v0.13.4 h1:E38Hfx0G9R9v7vRgKshviPotJQETG0S2gD3JdHLCAsI=
 sigs.k8s.io/kustomize/api v0.13.4/go.mod h1:Bkaavz5RKK6ZzP0zgPrB7QbpbBJKiHuD3BB0KujY7Ls=
 sigs.k8s.io/kustomize/kyaml v0.14.2 h1:9WSwztbzwGszG1bZTziQUmVMrJccnyrLb5ZMKpJGvXw=

hack/ensure-kind.sh

@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KIND_VERSION=v0.14.0
+MINIMUM_KIND_VERSION=v0.20.0
 GOARCH="$(go env GOARCH)"
 GOOS="$(go env GOOS)"
 

test/e2e/data/e2e_conf.yaml

@@ -20,25 +20,25 @@ images:
 ## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
 
   # Cluster API v1beta1 Preloads
-  - name: quay.io/jetstack/cert-manager-cainjector:v1.12.1
+  - name: quay.io/jetstack/cert-manager-cainjector:v1.12.2
     loadBehavior: tryLoad
-  - name: quay.io/jetstack/cert-manager-webhook:v1.12.1
+  - name: quay.io/jetstack/cert-manager-webhook:v1.12.2
     loadBehavior: tryLoad
-  - name: quay.io/jetstack/cert-manager-controller:v1.12.1
+  - name: quay.io/jetstack/cert-manager-controller:v1.12.2
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.1
+  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.4
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.1
+  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.4
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.1
+  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.4
     loadBehavior: tryLoad
 
 providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v1.4.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/core-components.yaml"
+      - name: v1.4.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -53,8 +53,8 @@ providers:
     files:
       - sourcePath: "./shared/v1beta1/metadata.yaml"
     versions:
-      - name: v1.4.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/bootstrap-components.yaml"
+      - name: v1.4.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -69,8 +69,8 @@ providers:
     files:
       - sourcePath: "./shared/v1beta1/metadata.yaml"
     versions:
-      - name: v1.4.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/control-plane-components.yaml"
+      - name: v1.4.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -142,7 +142,7 @@ variables:
   # allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
   # The following Kubernetes versions should be the latest versions with already published kindest/node images.
   # This avoids building node images in the default case which improves the test duration significantly.
-  KUBERNETES_VERSION_MANAGEMENT: "v1.26.0"
+  KUBERNETES_VERSION_MANAGEMENT: "v1.27.3"
   KUBERNETES_VERSION: "v1.26.0"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.26.0"
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.3"

test/e2e/data/e2e_eks_conf.yaml

@@ -17,25 +17,25 @@ images:
     loadBehavior: mustLoad
 
 ## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
-  - name: quay.io/jetstack/cert-manager-cainjector:v1.12.1
+  - name: quay.io/jetstack/cert-manager-cainjector:v1.12.2
     loadBehavior: tryLoad
-  - name: quay.io/jetstack/cert-manager-webhook:v1.12.1
+  - name: quay.io/jetstack/cert-manager-webhook:v1.12.2
     loadBehavior: tryLoad
-  - name: quay.io/jetstack/cert-manager-controller:v1.12.1
+  - name: quay.io/jetstack/cert-manager-controller:v1.12.2
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.3
+  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.4
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.3
+  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.4
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.3
+  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.4
     loadBehavior: tryLoad
 
 providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v1.4.3
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/core-components.yaml"
+      - name: v1.4.4
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -50,8 +50,8 @@ providers:
     files:
       - sourcePath: "./shared/v1beta1/metadata.yaml"
     versions:
-      - name: v1.4.3
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/bootstrap-components.yaml"
+      - name: v1.4.4
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -66,8 +66,8 @@ providers:
     files:
       - sourcePath: "./shared/v1beta1/metadata.yaml"
     versions:
-      - name: v1.4.3
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/control-plane-components.yaml"
+      - name: v1.4.4
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -117,7 +117,7 @@ providers:
 
 variables:
   KUBERNETES_VERSION: "v1.24.4"
-  KUBERNETES_VERSION_MANAGEMENT: "v1.24.4" # Kind bootstrap
+  KUBERNETES_VERSION_MANAGEMENT: "v1.27.3" # Kind bootstrap
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   EVENT_BRIDGE_INSTANCE_STATE: "true"

versions.mk

@@ -15,8 +15,8 @@
 MDBOOK_VERSION := v0.4.5
 PLANTUML_VERSION := 1.2020.16
 GH_VERSION := 2.7.0
-CERT_MANAGER_VERSION := v1.10.1
-CAPI_VERSION := v1.4.3
+CERT_MANAGER_VERSION := v1.12.2
+CAPI_VERSION := v1.4.4
 KPROMO_VERSION := v3.6.0
 YQ_VERSION := v4.25.2
-GOLANGCI_LINT_VERSION := v1.49.0
+GOLANGCI_LINT_VERSION := v1.52.2