Skip to content

Commit c4ed890

Browse files
authored
feat: bump images (#97)
1 parent a4af15e commit c4ed890

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export WORKER_MACHINE_SIZE=
204204

205205
export CLUSTER_NAME=
206206
export NAMESPACE=default
207-
export KUBERNETES_VERSION=v1.31.6
207+
export KUBERNETES_VERSION=v1.32.9
208208

209209
export CONTROL_PLANE_MACHINE_COUNT=1
210210
export WORKER_MACHINE_COUNT=1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ update-test-crds:
7777
go mod tidy
7878
rm -rf test/external-crds
7979
mkdir -p test/external-crds/cluster-api
80-
cp -f $(shell go list -mod=mod -m -f '{{.Dir}}' all | grep sigs.k8s.io/cluster-api)/config/crd/bases/* test/external-crds/cluster-api
80+
cp -f $(shell go list -mod=mod -m -f '{{.Dir}}' all | grep sigs.k8s.io/cluster-api@)/config/crd/bases/* test/external-crds/cluster-api
8181

8282
.PHONY: fmt
8383
fmt: ## Run go fmt against code.

capi-lab/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ KUBECONFIG := $(shell pwd)/mini-lab/.kubeconfig
77
MINI_LAB_FLAVOR=capms
88

99
CLUSTER_NAME ?= metal-test
10-
KUBERNETES_VERSION ?= 1.31.6
10+
KUBERNETES_VERSION ?= 1.32.9
1111

1212
METAL_API_URL=http://metal.203.0.113.1.nip.io:8080
1313
METAL_API_HMAC=metal-edit
@@ -19,9 +19,9 @@ METALCTL_HMAC_AUTH_TYPE=Metal-Edit
1919
METAL_PARTITION ?= mini-lab
2020
METAL_PROJECT_ID ?= 00000000-0000-0000-0000-000000000001
2121

22-
CONTROL_PLANE_MACHINE_IMAGE ?= ubuntu-24.0-k8s-$(KUBERNETES_VERSION)
22+
CONTROL_PLANE_MACHINE_IMAGE ?= capms-ubuntu-$(KUBERNETES_VERSION)
2323
CONTROL_PLANE_MACHINE_SIZE ?= v1-small-x86
24-
WORKER_MACHINE_IMAGE ?= ubuntu-24.0-k8s-$(KUBERNETES_VERSION)
24+
WORKER_MACHINE_IMAGE ?= capms-ubuntu-$(KUBERNETES_VERSION)
2525
WORKER_MACHINE_SIZE ?= v1-small-x86
2626

2727
IMG ?= ghcr.io/metal-stack/cluster-api-metal-stack-controller:latest

capi-lab/mini-lab-overrides/extra-vars.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,22 @@ metal_api_images:
1717
url: https://images.metal-stack.io/metal-os/stable/firewall/3.0-ubuntu/img.tar.lz4
1818
features:
1919
- firewall
20-
- id: ubuntu-24.4
21-
name: Ubuntu 24.04 with Kubernetes 1.30.6
22-
description: Ubuntu 24.04 with Kubernetes 1.30.6
23-
url: https://images.metal-stack.io/metal-os/pull_requests/273-cluster-api-k8s-v1.30.6/cluster-api/cluster-api-k8s-1.30.6/img.tar.lz4
20+
- id: capms-ubuntu-1.34.1
21+
name: Ubuntu 24.04 with Kubernetes 1.34.1
22+
description: Ubuntu 24.04 with Kubernetes 1.34.1
23+
url: https://images.metal-stack.io/metal-os/pull_requests/352-capi-images/capms-ubuntu/1.34.1/img.tar.lz4
24+
features:
25+
- machine
26+
- id: capms-ubuntu-1.33.5
27+
name: Ubuntu 24.04 with Kubernetes 1.33.5
28+
description: Ubuntu 24.04 with Kubernetes 1.33.5
29+
url: https://images.metal-stack.io/metal-os/pull_requests/352-capi-images/capms-ubuntu/1.33.5/img.tar.lz4
30+
features:
31+
- machine
32+
- id: capms-ubuntu-1.32.9
33+
name: Ubuntu 24.04 with Kubernetes 1.32.9
34+
description: Ubuntu 24.04 with Kubernetes 1.32.9
35+
url: https://images.metal-stack.io/metal-os/pull_requests/352-capi-images/capms-ubuntu/1.32.9/img.tar.lz4
2436
features:
2537
- machine
2638

0 commit comments

Comments
 (0)