Skip to content

Commit c44b6cd

Browse files
tamalsahatamalsaha
committed
update-stuff
Signed-off-by: Tamal Saha <[email protected]>
1 parent 787fd05 commit c44b6cd

11 files changed

+32
-26
lines changed

‎Makefile

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

3535
# Go version
36-
GOLANG_VERSION := 1.22.11
36+
GOLANG_VERSION := 1.23.8
3737

3838
# Kubebuilder
39-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
39+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
4040
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
4141
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
4242

@@ -62,11 +62,11 @@ CONVERSION_VERIFIER:= $(TOOLS_BIN_DIR)/conversion-verifier
6262
# Binaries.
6363
CLUSTERCTL := $(BIN_DIR)/clusterctl
6464

65-
CONTROLLER_GEN_VER := v0.17.1
65+
CONTROLLER_GEN_VER := v0.17.3
6666
CONTROLLER_GEN_BIN := controller-gen
6767
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
6868

69-
CONVERSION_GEN_VER := v0.31.5
69+
CONVERSION_GEN_VER := v0.32.0
7070
CONVERSION_GEN_BIN := conversion-gen
7171
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
7272

@@ -78,7 +78,7 @@ GOLANGCI_LINT_VER := v1.63.4
7878
GOLANGCI_LINT_BIN := golangci-lint
7979
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
8080

81-
KIND_VER := v0.26.0
81+
KIND_VER := v0.27.0
8282
KIND_BIN := kind
8383
KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
8484

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: gcpclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: gcpclustertemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.3
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: 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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: gcpmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: gcpmanagedclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: gcpmanagedcontrolplanes.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedmachinepools.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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: gcpmanagedmachinepools.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ releaseSeries:
4141
- major: 1
4242
minor: 9
4343
contract: v1beta1
44+
- major: 1
45+
minor: 10
46+
contract: v1beta1

‎test/e2e/config/gcp-ci.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ providers:
1515
- name: cluster-api
1616
type: CoreProvider
1717
versions:
18-
- name: v1.9.4
19-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/core-components.yaml
18+
- name: v1.10.0
19+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0/core-components.yaml
2020
type: url
2121
files:
2222
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -28,8 +28,8 @@ providers:
2828
- name: kubeadm
2929
type: BootstrapProvider
3030
versions:
31-
- name: v1.9.4
32-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/bootstrap-components.yaml
31+
- name: v1.10.0
32+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0/bootstrap-components.yaml
3333
type: url
3434
files:
3535
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -41,8 +41,8 @@ providers:
4141
- name: kubeadm
4242
type: ControlPlaneProvider
4343
versions:
44-
- name: v1.9.4
45-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/control-plane-components.yaml
44+
- name: v1.10.0
45+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0/control-plane-components.yaml
4646
type: url
4747
files:
4848
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -54,7 +54,7 @@ providers:
5454
- name: gcp
5555
type: InfrastructureProvider
5656
versions:
57-
- name: v1.9.99 # next; use manifest from source files
57+
- name: v1.10.99 # next; use manifest from source files
5858
value: "${PWD}/config/default"
5959
files:
6060
- sourcePath: "${PWD}/metadata.yaml"
@@ -75,16 +75,16 @@ providers:
7575
- sourcePath: "${PWD}/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml"
7676

7777
variables:
78-
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.31.0}"
79-
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0"
80-
ETCD_VERSION_UPGRADE_TO: "3.5.14-0"
78+
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.32.0}"
79+
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0"
80+
ETCD_VERSION_UPGRADE_TO: "3.5.16-0"
8181
COREDNS_VERSION_UPGRADE_TO: "v1.11.3"
82-
KUBERNETES_IMAGE_UPGRADE_FROM: "projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-2204-v1-31-0-nightly"
83-
KUBERNETES_IMAGE_UPGRADE_TO: "projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-2204-v1-30-5-nightly"
82+
KUBERNETES_IMAGE_UPGRADE_FROM: "projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-2204-v1-32-0-nightly"
83+
KUBERNETES_IMAGE_UPGRADE_TO: "projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-2204-v1-31-0-nightly"
8484
CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO: "cp-k8s-upgrade-and-conformance"
8585
WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "worker-k8s-upgrade-and-conformance"
86-
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.31.0}"
87-
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.30.5}"
86+
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.32.0}"
87+
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.31.0}"
8888
EXP_CLUSTER_RESOURCE_SET: "true"
8989
CLUSTER_TOPOLOGY: "true"
9090
# Cluster Addons

‎test/e2e/data/shared/v1beta1/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
22
kind: Metadata
33
releaseSeries:
4+
- major: 1
5+
minor: 10
6+
contract: v1beta1
47
- major: 1
58
minor: 9
69
contract: v1beta1

0 commit comments

Comments
 (0)