Skip to content

Commit a4c1bd4

Browse files
wikkykmcbenjemaa
andauthored
docs, test: k8s 1.30 (#321)
* test: bump k8s to 1.30.6 * docs/advanced-setups: bump k8s to 1.30.6 * go.mod: bump k8s.io/* to v0.30.6 * Update proxmox-ci.yaml * Update proxmox-dev.yaml * Update Makefile --------- Co-authored-by: Mohamed Chiheb Ben Jemaa <[email protected]>
1 parent 11692d3 commit a4c1bd4

File tree

9 files changed

+319
-59
lines changed

9 files changed

+319
-59
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.28.0
5+
ENVTEST_K8S_VERSION = 1.30.0
66

77
TOOLS_DIR := hack/tools
88

@@ -219,7 +219,7 @@ crs-cilium: ## Generates crs manifests for Cilium.
219219
$(HELM) repo add cilium https://helm.cilium.io/ --force-update
220220
$(HELM) template cilium cilium/cilium --version $(CILIUM_VERSION) --set internalTrafficPolicy=local --namespace kube-system > templates/crs/cni/cilium.yaml
221221

222-
CALICO_VERSION ?= v3.26.3
222+
CALICO_VERSION ?= v3.28.2
223223

224224
.PHONY: crs-calico
225225
crs-calico: ## Generates crs manifests for Calico.

docs/advanced-setups.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Metrics are, like all network configuration, part of bootstrap, and will not rec
7373
```bash
7474
clusterctl generate cluster test-multiple-vlans \
7575
--infrastructure proxmox \
76-
--kubernetes-version v1.28.3 \
76+
--kubernetes-version v1.30.6 \
7777
--control-plane-machine-count=1 \
7878
--worker-machine-count=2 \
7979
--flavor=multiple-vlans > cluster.yaml
@@ -106,7 +106,7 @@ If you're using cilium, be aware that Cilium's helm chart requires `ipv6.enabled
106106
```bash
107107
clusterctl generate cluster test-duacl-stack \
108108
--infrastructure proxmox \
109-
--kubernetes-version v1.28.3 \
109+
--kubernetes-version v1.30.6 \
110110
--control-plane-machine-count=1 \
111111
--worker-machine-count=2 \
112112
--flavor=dual-stack > cluster.yaml
@@ -162,7 +162,7 @@ METALLB_IPV6_RANGE:
162162
```bash
163163
clusterctl generate cluster test-bgp-lb \
164164
--infrastructure proxmox \
165-
--kubernetes-version v1.28.3 \
165+
--kubernetes-version v1.30.6 \
166166
--control-plane-machine-count=1 \
167167
--worker-machine-count=2 \
168168
--flavor=cilium-load-balancer > cluster.yaml

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ require (
1818
github.com/stretchr/testify v1.9.0
1919
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35
2020
golang.org/x/tools v0.27.0
21-
k8s.io/api v0.30.4
22-
k8s.io/apimachinery v0.30.4
23-
k8s.io/client-go v0.30.4
21+
k8s.io/api v0.30.6
22+
k8s.io/apimachinery v0.30.6
23+
k8s.io/client-go v0.30.6
2424
k8s.io/klog/v2 v2.130.1
2525
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2626
sigs.k8s.io/cluster-api v1.8.5

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,16 +428,16 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
428428
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
429429
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
430430
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
431-
k8s.io/api v0.30.4 h1:XASIELmW8w8q0i1Y4124LqPoWMycLjyQti/fdYHYjCs=
432-
k8s.io/api v0.30.4/go.mod h1:ZqniWRKu7WIeLijbbzetF4U9qZ03cg5IRwl8YVs8mX0=
431+
k8s.io/api v0.30.6 h1:uqRDLnFkmPLorI9D0x1dGXdYeRQMhQHlrHDgZ3/45RE=
432+
k8s.io/api v0.30.6/go.mod h1:6x759Hj7155pXRKStxzM7TMN9hW0x7WrBr51kuDMSHo=
433433
k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U=
434434
k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4=
435-
k8s.io/apimachinery v0.30.4 h1:5QHQI2tInzr8LsT4kU/2+fSeibH1eIHswNx480cqIoY=
436-
k8s.io/apimachinery v0.30.4/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
435+
k8s.io/apimachinery v0.30.6 h1:dlplzGrUL/DiPOVVVjDcT9ZoQBOwYeB6hcFy90veggs=
436+
k8s.io/apimachinery v0.30.6/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
437437
k8s.io/apiserver v0.30.3 h1:QZJndA9k2MjFqpnyYv/PH+9PE0SHhx3hBho4X0vE65g=
438438
k8s.io/apiserver v0.30.3/go.mod h1:6Oa88y1CZqnzetd2JdepO0UXzQX4ZnOekx2/PtEjrOg=
439-
k8s.io/client-go v0.30.4 h1:eculUe+HPQoPbixfwmaSZGsKcOf7D288tH6hDAdd+wY=
440-
k8s.io/client-go v0.30.4/go.mod h1:IBS0R/Mt0LHkNHF4E6n+SUDPG7+m2po6RZU7YHeOpzc=
439+
k8s.io/client-go v0.30.6 h1:hMo7AUkHy/UqnwPMH+oJvFR9gpvXVfQnsiO+G2fdE30=
440+
k8s.io/client-go v0.30.6/go.mod h1:DDN89/30A1DfatO+c3ksYMM12kL7a/CZvsBaVjwh33g=
441441
k8s.io/cluster-bootstrap v0.30.3 h1:MgxyxMkpaC6mu0BKWJ8985XCOnKU+eH3Iy+biwtDXRk=
442442
k8s.io/cluster-bootstrap v0.30.3/go.mod h1:h8BoLDfdD7XEEIXy7Bx9FcMzxHwz29jsYYi34bM5DKU=
443443
k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s=

test/e2e/config/proxmox-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ providers:
8181
- sourcePath: "${PWD}/test/e2e/data/infrastructure-proxmox/cluster-template-upgrades.yaml"
8282

8383
variables:
84-
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.28.6}"
84+
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.30.5}"
8585
CONTROL_PLANE_MACHINE_COUNT: "${CONTROL_PLANE_MACHINE_COUNT:-1}"
8686
WORKER_MACHINE_COUNT: "${WORKER_MACHINE_COUNT:-2}"
8787
EXP_CLUSTER_RESOURCE_SET: "true"
8888
# Cluster Addons
8989
CNI: "${PWD}/test/e2e/data/cni/calico.yaml"
9090

9191
PROXMOX_SOURCENODE: "${PROXMOX_SOURCENODE:-pve}"
92-
TEMPLATE_VMID: "${TEMPLATE_VMID:-102}"
92+
TEMPLATE_VMID: "${TEMPLATE_VMID:-112}"
9393
VM_SSH_KEYS: "${VM_SSH_KEYS:-}"
9494
NODE_IP_RANGES: "${NODE_IP_RANGES:-[10.10.10.15-10.10.10.120]}"
9595
GATEWAY: "${GATEWAY:-10.10.10.1}"

test/e2e/config/proxmox-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ providers:
8181
- sourcePath: "${PWD}/test/e2e/data/infrastructure-proxmox/cluster-template-upgrades.yaml"
8282

8383
variables:
84-
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.27.8}"
84+
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.30.5}"
8585
CONTROL_PLANE_MACHINE_COUNT: "${CONTROL_PLANE_MACHINE_COUNT:-1}"
8686
WORKER_MACHINE_COUNT: "${WORKER_MACHINE_COUNT:-2}"
8787
EXP_CLUSTER_RESOURCE_SET: "true"

0 commit comments

Comments
 (0)