Merge pull request #3920 from Ankitasw/capi-bump

chore: Bump CAPI to v1.3.1

Author: k8s-ci-robot

.github/workflows/dependabot.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.18'
+        go-version: '1.19'
       id: go
     - name: Check out code into the Go module directory
       uses: actions/[email protected]

.golangci.yml

@@ -150,9 +150,9 @@ linters-settings:
       - pkg: "sigs.k8s.io/cluster-api/exp/api/v1beta1"
         alias: expclusterv1
   staticcheck:
-    go: "1.18"
+    go: "1.19"
   stylecheck:
-    go: "1.18"
+    go: "1.19"
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0

Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.18.3 as toolchain
+FROM golang:1.19.4 as toolchain
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
 ARG goproxy=https://proxy.golang.org

Makefile

@@ -143,7 +143,7 @@ ifeq ($(findstring \[PR-Blocking\],$(E2E_FOCUS)),\[PR-Blocking\])
 endif
 
 override E2E_ARGS += -artifacts-folder="$(ARTIFACTS)" --data-folder="$(E2E_DATA_DIR)" -use-existing-cluster=$(USE_EXISTING_CLUSTER)
-override GINKGO_ARGS += -stream -progress -v -trace
+override GINKGO_ARGS += -v --trace --timeout=3h --output-dir="$(ARTIFACTS)" --junit-report="junit.e2e_suite.xml"
 
 ifdef GINKGO_SKIP
 	override GINKGO_ARGS += -skip "$(GINKGO_SKIP)"

api/v1beta2/suite_test.go

@@ -21,12 +21,11 @@ import (
 	"path"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
 	"sigs.k8s.io/cluster-api-provider-aws/v2/test/helpers"
 )
@@ -39,9 +38,7 @@ var (
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t, "Controller Suite")
 }
 
 func TestMain(m *testing.M) {

controllers/awsmachine_controller_unit_test.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 	"github.com/pkg/errors"

docs/book/src/development/development.md

@@ -5,7 +5,7 @@
 ### Install prerequisites
 
 1. Install [go][go]
-    - Get the latest patch version for go v1.18.
+    - Get the latest patch version for go v1.19.
 2. Install [jq][jq]
     - `brew install jq` on macOS.
     - `chocolatey install jq` on Windows.

docs/book/src/topics/machinepools.md

@@ -20,7 +20,7 @@ Make sure to set up your AWS environment as described [here](https://cluster-api
 ```shell
 export EXP_MACHINE_POOL=true
 clusterctl init --infrastructure aws
-clusterctl generate cluster my-cluster --kubernetes-version v1.24.0 --flavor machinepool > my-cluster.yaml
+clusterctl generate cluster my-cluster --kubernetes-version v1.25.0 --flavor machinepool > my-cluster.yaml
 ```
 
 The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors) is located [here](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/templates/cluster-template-machinepool.yaml).
@@ -76,7 +76,7 @@ spec:
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         kind: AWSMachinePool
         name: capa-mp-0
-      version: v1.24.0
+      version: v1.25.0
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AWSMachinePool
@@ -136,7 +136,7 @@ spec:
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         kind: AWSMachinePool
         name: capa-mp-0
-      version: v1.24.0
+      version: v1.25.0
 ```
 
 When using GitOps, make sure to ignore differences in `spec.replicas` on MachinePools. Example when using ArgoCD:

docs/triage-party/Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
-FROM golang:1.18.3  as builder
+FROM golang:1.19.4  as builder
 
 RUN go get github.com/google/triage-party/cmd/server
 RUN go install github.com/google/triage-party/cmd/server@latest

docs/triage-party/go.mod

@@ -1,6 +1,6 @@
 module triage-party-deployment
 
-go 1.18
+go 1.19
 
 require (
 	github.com/aws/aws-cdk-go/awscdk v1.110.0-devpreview