Skip to content

Commit 73f98b0

Browse files
committed
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
1 parent 2ad9391 commit 73f98b0

20 files changed

+996
-1245
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export GOPROXY
3333
export GO111MODULE=on
3434

3535
# Kubebuilder
36-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
36+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.0
3737
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
3838
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
3939

@@ -59,23 +59,23 @@ CONVERSION_VERIFIER:= $(TOOLS_BIN_DIR)/conversion-verifier
5959
# Binaries.
6060
CLUSTERCTL := $(BIN_DIR)/clusterctl
6161

62-
CONTROLLER_GEN_VER := v0.13.0
62+
CONTROLLER_GEN_VER := v0.14.0
6363
CONTROLLER_GEN_BIN := controller-gen
6464
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
6565

66-
CONVERSION_GEN_VER := v0.28.6
66+
CONVERSION_GEN_VER := v0.29.3
6767
CONVERSION_GEN_BIN := conversion-gen
6868
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
6969

7070
ENVSUBST_VER := v1.4.2
7171
ENVSUBST_BIN := envsubst
7272
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
7373

74-
GOLANGCI_LINT_VER := v1.55.2
74+
GOLANGCI_LINT_VER := v1.57.2
7575
GOLANGCI_LINT_BIN := golangci-lint
7676
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7777

78-
KIND_VER := v0.20.0
78+
KIND_VER := v0.22.0
7979
KIND_BIN := kind
8080
KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
8181

@@ -92,7 +92,7 @@ GINKGO_BIN := ginkgo
9292
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
9393
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
9494

95-
KUBECTL_VER := v1.28.6
95+
KUBECTL_VER := v1.29.3
9696
KUBECTL_BIN := kubectl
9797
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
9898

Tiltfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ settings = {
1818
"deploy_cert_manager": True,
1919
"preload_images_for_kind": True,
2020
"kind_cluster_name": "capg",
21-
"capi_version": "v1.6.2",
21+
"capi_version": "v1.7.0",
2222
"cert_manager_version": "v1.11.0",
23-
"kubernetes_version": "v1.28.6",
23+
"kubernetes_version": "v1.29.3",
2424
}
2525

2626
keys = ["GCP_B64ENCODED_CREDENTIALS"]

cloud/providerid/providerid_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestProviderID_New(t *testing.T) {
6666
}
6767

6868
for _, tc := range testCases {
69-
t.Run(tc.testname, func(t *testing.T) {
69+
t.Run(tc.testname, func(_ *testing.T) {
7070
providerID, err := providerid.New(tc.project, tc.location, tc.name)
7171

7272
if tc.expectError {
@@ -102,7 +102,7 @@ func TestProviderID_NewFromResourceURL(t *testing.T) {
102102
}
103103

104104
for _, tc := range testCases {
105-
t.Run(tc.testname, func(t *testing.T) {
105+
t.Run(tc.testname, func(_ *testing.T) {
106106
providerID, err := providerid.NewFromResourceURL(tc.resourceURL)
107107

108108
if tc.expectError {

cloud/services/compute/instances/reconcile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func TestService_createOrGetInstance(t *testing.T) {
211211
mockInstance: &cloud.MockInstances{
212212
ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"},
213213
Objects: map[meta.Key]*cloud.MockInstancesObj{},
214-
GetHook: func(ctx context.Context, key *meta.Key, m *cloud.MockInstances) (bool, *compute.Instance, error) {
214+
GetHook: func(_ context.Context, _ *meta.Key, _ *cloud.MockInstances) (bool, *compute.Instance, error) {
215215
return true, &compute.Instance{}, &googleapi.Error{Code: http.StatusBadRequest}
216216
},
217217
},

cloud/services/compute/subnets/reconcile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestService_Reconcile(t *testing.T) {
111111
mockSubnetworks: &cloud.MockSubnetworks{
112112
ProjectRouter: &cloud.SingleProjectRouter{ID: "my-proj"},
113113
Objects: map[meta.Key]*cloud.MockSubnetworksObj{},
114-
GetHook: func(ctx context.Context, key *meta.Key, m *cloud.MockSubnetworks) (bool, *compute.Subnetwork, error) {
114+
GetHook: func(_ context.Context, _ *meta.Key, _ *cloud.MockSubnetworks) (bool, *compute.Subnetwork, error) {
115115
return true, &compute.Subnetwork{}, &googleapi.Error{Code: http.StatusBadRequest}
116116
},
117117
},

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

Lines changed: 115 additions & 92 deletions
Large diffs are not rendered by default.

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

Lines changed: 102 additions & 89 deletions
Large diffs are not rendered by default.

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

Lines changed: 184 additions & 178 deletions
Large diffs are not rendered by default.

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

Lines changed: 158 additions & 176 deletions
Large diffs are not rendered by default.

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

Lines changed: 130 additions & 107 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)