Skip to content

Commit f37f1be

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1357 from damdo/capi-1.9
Bump CAPI to v1.9.z
2 parents e1eea20 + 10203ab commit f37f1be

24 files changed

+256
-258
lines changed

‎Makefile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ export GOPROXY
3232
# Active module mode, as we use go modules to manage dependencies
3333
export GO111MODULE=on
3434

35+
# Go version
36+
GOLANG_VERSION := 1.22.11
37+
3538
# Kubebuilder
36-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.0
39+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
3740
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
3841
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
3942

@@ -59,23 +62,23 @@ CONVERSION_VERIFIER:= $(TOOLS_BIN_DIR)/conversion-verifier
5962
# Binaries.
6063
CLUSTERCTL := $(BIN_DIR)/clusterctl
6164

62-
CONTROLLER_GEN_VER := v0.16.3
65+
CONTROLLER_GEN_VER := v0.17.1
6366
CONTROLLER_GEN_BIN := controller-gen
6467
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
6568

66-
CONVERSION_GEN_VER := v0.30.5
69+
CONVERSION_GEN_VER := v0.31.5
6770
CONVERSION_GEN_BIN := conversion-gen
6871
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
6972

7073
ENVSUBST_VER := v1.4.2
7174
ENVSUBST_BIN := envsubst
7275
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
7376

74-
GOLANGCI_LINT_VER := v1.61.0
77+
GOLANGCI_LINT_VER := v1.63.4
7578
GOLANGCI_LINT_BIN := golangci-lint
7679
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7780

78-
KIND_VER := v0.24.0
81+
KIND_VER := v0.26.0
7982
KIND_BIN := kind
8083
KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
8184

@@ -87,12 +90,12 @@ RELEASE_NOTES_VER := v0.11.0
8790
RELEASE_NOTES_BIN := release-notes
8891
RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
8992

90-
GINKGO_VER := v2.20.2
93+
GINKGO_VER := v2.22.2
9194
GINKGO_BIN := ginkgo
9295
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
9396
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
9497

95-
KUBECTL_VER := v1.30.5
98+
KUBECTL_VER := v1.31.5
9699
KUBECTL_BIN := kubectl
97100
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
98101

@@ -111,7 +114,7 @@ GOTESTSUM_BIN := gotestsum
111114
GOTESTSUM := $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)
112115

113116
# Other tools versions
114-
CERT_MANAGER_VER := v1.14.4
117+
CERT_MANAGER_VER := v1.16.3
115118

116119
# Define Docker related variables. Releases should modify and double check these vars.
117120
export GCP_PROJECT ?= $(shell gcloud config get-value project)
@@ -145,8 +148,6 @@ endif
145148
# Build time versioning details.
146149
LDFLAGS := $(shell hack/version.sh)
147150

148-
GOLANG_VERSION := 1.21.10
149-
150151
# CI
151152
CAPG_WORKER_CLUSTER_KUBECONFIG ?= "/tmp/kubeconfig"
152153

‎api/v1beta1/gcpmachine_types.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package v1beta1
1919
import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"sigs.k8s.io/cluster-api/errors"
2322
)
2423

2524
const (
@@ -386,7 +385,7 @@ type GCPMachineStatus struct {
386385
// can be added as events to the Machine object and/or logged in the
387386
// controller's output.
388387
// +optional
389-
FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
388+
FailureReason *string `json:"failureReason,omitempty"`
390389

391390
// FailureMessage will be set in the event that there is a terminal problem
392391
// reconciling the Machine and will contain a more verbose string suitable

‎api/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloud/interfaces.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
corev1 "k8s.io/api/core/v1"
2626
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
2727
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
28-
capierrors "sigs.k8s.io/cluster-api/errors"
2928
)
3029

3130
// Cloud alias for cloud.Cloud interface.
@@ -99,7 +98,7 @@ type MachineSetter interface {
9998
SetProviderID()
10099
SetInstanceStatus(v infrav1.InstanceStatus)
101100
SetFailureMessage(v error)
102-
SetFailureReason(v capierrors.MachineStatusError)
101+
SetFailureReason(v string)
103102
SetAnnotation(key, value string)
104103
SetAddresses(addressList []corev1.NodeAddress)
105104
}

‎cloud/scope/machine.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"sigs.k8s.io/cluster-api-provider-gcp/cloud/providerid"
3838
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/shared"
3939
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
40-
capierrors "sigs.k8s.io/cluster-api/errors"
4140
"sigs.k8s.io/cluster-api/util"
4241
"sigs.k8s.io/cluster-api/util/patch"
4342
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -201,7 +200,7 @@ func (m *MachineScope) SetFailureMessage(v error) {
201200
}
202201

203202
// SetFailureReason sets the GCPMachine status failure reason.
204-
func (m *MachineScope) SetFailureReason(v capierrors.MachineStatusError) {
203+
func (m *MachineScope) SetFailureReason(v string) {
205204
m.GCPMachine.Status.FailureReason = &v
206205
}
207206

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.3
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: gcpclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -340,11 +340,11 @@ spec:
340340
attributes:
341341
additionalProperties:
342342
type: string
343-
description: Attributes is a free form map of attributes an
343+
description: attributes is a free form map of attributes an
344344
infrastructure provider might use or require.
345345
type: object
346346
controlPlane:
347-
description: ControlPlane determines if this failure domain
347+
description: controlPlane determines if this failure domain
348348
is suitable for use by control plane machines.
349349
type: boolean
350350
type: object

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.3
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: gcpclustertemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -56,7 +56,7 @@ spec:
5656
additionalProperties:
5757
type: string
5858
description: |-
59-
Annotations is an unstructured key value map stored with a resource that may be
59+
annotations is an unstructured key value map stored with a resource that may be
6060
set by external tools to store and retrieve arbitrary metadata. They are not
6161
queryable and should be preserved when modifying objects.
6262
More info: http://kubernetes.io/docs/user-guide/annotations

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.3
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: gcpmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.3
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: gcpmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -55,7 +55,7 @@ spec:
5555
additionalProperties:
5656
type: string
5757
description: |-
58-
Annotations is an unstructured key value map stored with a resource that may be
58+
annotations is an unstructured key value map stored with a resource that may be
5959
set by external tools to store and retrieve arbitrary metadata. They are not
6060
queryable and should be preserved when modifying objects.
6161
More info: http://kubernetes.io/docs/user-guide/annotations

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.3
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: gcpmanagedclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -350,20 +350,20 @@ spec:
350350
description: |-
351351
The reason for the condition's last transition in CamelCase.
352352
The specific API may choose whether or not this field is considered a guaranteed API.
353-
This field may not be empty.
353+
This field may be empty.
354354
type: string
355355
severity:
356356
description: |-
357-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
357+
severity provides an explicit classification of Reason code, so the users or machines can immediately
358358
understand the current situation and act accordingly.
359359
The Severity field MUST be set only when Status=False.
360360
type: string
361361
status:
362-
description: Status of the condition, one of True, False, Unknown.
362+
description: status of the condition, one of True, False, Unknown.
363363
type: string
364364
type:
365365
description: |-
366-
Type of condition in CamelCase or in foo.example.com/CamelCase.
366+
type of condition in CamelCase or in foo.example.com/CamelCase.
367367
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
368368
can be useful (see .node.status.conditions), the ability to deconflict is important.
369369
type: string
@@ -382,11 +382,11 @@ spec:
382382
attributes:
383383
additionalProperties:
384384
type: string
385-
description: Attributes is a free form map of attributes an
385+
description: attributes is a free form map of attributes an
386386
infrastructure provider might use or require.
387387
type: object
388388
controlPlane:
389-
description: ControlPlane determines if this failure domain
389+
description: controlPlane determines if this failure domain
390390
is suitable for use by control plane machines.
391391
type: boolean
392392
type: object

0 commit comments

Comments
 (0)