bump capi to v1.7.0

capi 1.7.x: bump tools files
capi 1.7.x: bump test environment
capi 1.7.x: run make generate
capi 1.7.x: bump go modules
capi 1.7.x: fix linting
capi 1.7.x: update metadata.yaml
capi 1.7.x: change k8s image version
use capi v1.7.0-rc.0
use capi v1.7.0-rc.1
bump patch version of golangci-lint
use v1.7.99 as next version

Makefile

@@ -33,7 +33,7 @@ export GOPROXY
 export GO111MODULE=on
 
 # Kubebuilder
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.0
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
 
@@ -59,23 +59,23 @@ CONVERSION_VERIFIER:= $(TOOLS_BIN_DIR)/conversion-verifier
 # Binaries.
 CLUSTERCTL := $(BIN_DIR)/clusterctl
 
-CONTROLLER_GEN_VER := v0.13.0
+CONTROLLER_GEN_VER := v0.14.0
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
-CONVERSION_GEN_VER := v0.28.6
+CONVERSION_GEN_VER := v0.29.3
 CONVERSION_GEN_BIN := conversion-gen
 CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
 
 ENVSUBST_VER := v1.4.2
 ENVSUBST_BIN := envsubst
 ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
 
-GOLANGCI_LINT_VER := v1.55.2
+GOLANGCI_LINT_VER := v1.57.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
-KIND_VER := v0.20.0
+KIND_VER := v0.22.0
 KIND_BIN := kind
 KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
 
@@ -92,7 +92,7 @@ GINKGO_BIN := ginkgo
 GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
 GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
 
-KUBECTL_VER := v1.28.6
+KUBECTL_VER := v1.29.3
 KUBECTL_BIN := kubectl
 KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
 

Tiltfile

@@ -18,9 +18,9 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capg",
-    "capi_version": "v1.6.2",
+    "capi_version": "v1.7.0",
     "cert_manager_version": "v1.11.0",
-    "kubernetes_version": "v1.28.6",
+    "kubernetes_version": "v1.29.3",
 }
 
 keys = ["GCP_B64ENCODED_CREDENTIALS"]

cloud/providerid/providerid_test.go

@@ -66,7 +66,7 @@ func TestProviderID_New(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		t.Run(tc.testname, func(t *testing.T) {
+		t.Run(tc.testname, func(_ *testing.T) {
 			providerID, err := providerid.New(tc.project, tc.location, tc.name)
 
 			if tc.expectError {
@@ -102,7 +102,7 @@ func TestProviderID_NewFromResourceURL(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		t.Run(tc.testname, func(t *testing.T) {
+		t.Run(tc.testname, func(_ *testing.T) {
 			providerID, err := providerid.NewFromResourceURL(tc.resourceURL)
 
 			if tc.expectError {

cloud/services/compute/instances/reconcile_test.go

@@ -211,7 +211,7 @@ func TestService_createOrGetInstance(t *testing.T) {
 			mockInstance: &cloud.MockInstances{
 				ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"},
 				Objects:       map[meta.Key]*cloud.MockInstancesObj{},
-				GetHook: func(ctx context.Context, key *meta.Key, m *cloud.MockInstances) (bool, *compute.Instance, error) {
+				GetHook: func(_ context.Context, _ *meta.Key, _ *cloud.MockInstances) (bool, *compute.Instance, error) {
 					return true, &compute.Instance{}, &googleapi.Error{Code: http.StatusBadRequest}
 				},
 			},

cloud/services/compute/subnets/reconcile_test.go

@@ -111,7 +111,7 @@ func TestService_Reconcile(t *testing.T) {
 			mockSubnetworks: &cloud.MockSubnetworks{
 				ProjectRouter: &cloud.SingleProjectRouter{ID: "my-proj"},
 				Objects:       map[meta.Key]*cloud.MockSubnetworksObj{},
-				GetHook: func(ctx context.Context, key *meta.Key, m *cloud.MockSubnetworks) (bool, *compute.Subnetwork, error) {
+				GetHook: func(_ context.Context, _ *meta.Key, _ *cloud.MockSubnetworks) (bool, *compute.Subnetwork, error) {
 					return true, &compute.Subnetwork{}, &googleapi.Error{Code: http.StatusBadRequest}
 				},
 			},

config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: gcpmanagedcontrolplanes.infrastructure.cluster.x-k8s.io
 spec:
   group: infrastructure.cluster.x-k8s.io
@@ -43,29 +43,36 @@ spec:
           API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
           spec:
             description: GCPManagedControlPlaneSpec defines the desired state of GCPManagedControlPlane.
             properties:
               clusterName:
-                description: ClusterName allows you to specify the name of the GKE
-                  cluster. If you don't specify a name then a default name will be
-                  created based on the namespace and name of the managed control plane.
+                description: |-
+                  ClusterName allows you to specify the name of the GKE cluster.
+                  If you don't specify a name then a default name will be created
+                  based on the namespace and name of the managed control plane.
                 type: string
               controlPlaneVersion:
-                description: ControlPlaneVersion represents the control plane version
-                  of the GKE cluster. If not specified, the default version currently
-                  supported by GKE will be used.
+                description: |-
+                  ControlPlaneVersion represents the control plane version of the GKE cluster.
+                  If not specified, the default version currently supported by GKE will be
+                  used.
                 type: string
               enableAutopilot:
                 description: EnableAutopilot indicates whether to enable autopilot
@@ -87,17 +94,19 @@ spec:
                 - port
                 type: object
               location:
-                description: Location represents the location (region or zone) in
-                  which the GKE cluster will be created.
+                description: |-
+                  Location represents the location (region or zone) in which the GKE cluster
+                  will be created.
                 type: string
               master_authorized_networks_config:
-                description: MasterAuthorizedNetworksConfig represents configuration
-                  options for master authorized networks feature of the GKE cluster.
+                description: |-
+                  MasterAuthorizedNetworksConfig represents configuration options for master authorized networks feature of the GKE cluster.
                   This feature is disabled if this field is not specified.
                 properties:
                   cidr_blocks:
-                    description: cidr_blocks define up to 50 external networks that
-                      could access Kubernetes master through HTTPS.
+                    description: |-
+                      cidr_blocks define up to 50 external networks that could access
+                      Kubernetes master through HTTPS.
                     items:
                       description: MasterAuthorizedNetworksConfigCidrBlock contains
                         an optional name and one CIDR block.
@@ -145,37 +154,37 @@ spec:
                     operational state.
                   properties:
                     lastTransitionTime:
-                      description: Last time the condition transitioned from one status
-                        to another. This should be when the underlying condition changed.
-                        If that is not known, then using the time when the API field
-                        changed is acceptable.
+                      description: |-
+                        Last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed. If that is not known, then using the time when
+                        the API field changed is acceptable.
                       format: date-time
                       type: string
                     message:
-                      description: A human readable message indicating details about
-                        the transition. This field may be empty.
+                      description: |-
+                        A human readable message indicating details about the transition.
+                        This field may be empty.
                       type: string
                     reason:
-                      description: The reason for the condition's last transition
-                        in CamelCase. The specific API may choose whether or not this
-                        field is considered a guaranteed API. This field may not be
-                        empty.
+                      description: |-
+                        The reason for the condition's last transition in CamelCase.
+                        The specific API may choose whether or not this field is considered a guaranteed API.
+                        This field may not be empty.
                       type: string
                     severity:
-                      description: Severity provides an explicit classification of
-                        Reason code, so the users or machines can immediately understand
-                        the current situation and act accordingly. The Severity field
-                        MUST be set only when Status=False.
+                      description: |-
+                        Severity provides an explicit classification of Reason code, so the users or machines can immediately
+                        understand the current situation and act accordingly.
+                        The Severity field MUST be set only when Status=False.
                       type: string
                     status:
                       description: Status of the condition, one of True, False, Unknown.
                       type: string
                     type:
-                      description: Type of condition in CamelCase or in foo.example.com/CamelCase.
-                        Many .condition.type values are consistent across resources
-                        like Available, but because arbitrary conditions can be useful
-                        (see .node.status.conditions), the ability to deconflict is
-                        important.
+                      description: |-
+                        Type of condition in CamelCase or in foo.example.com/CamelCase.
+                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
+                        can be useful (see .node.status.conditions), the ability to deconflict is important.
                       type: string
                   required:
                   - lastTransitionTime
@@ -188,14 +197,15 @@ spec:
                   plane.
                 type: string
               initialized:
-                description: Initialized is true when the control plane is available
-                  for initial contact. This may occur before the control plane is
-                  fully ready.
+                description: |-
+                  Initialized is true when the control plane is available for initial contact.
+                  This may occur before the control plane is fully ready.
                 type: boolean
               ready:
                 default: false
-                description: Ready denotes that the GCPManagedControlPlane API Server
-                  is ready to receive requests.
+                description: |-
+                  Ready denotes that the GCPManagedControlPlane API Server is ready to
+                  receive requests.
                 type: boolean
             required:
             - ready