Skip to content

Commit ba4e051

Browse files
committed
apply review notes. rename cluster-template-kcp-remediation, add TARGET_PLATFORM arg to makefile
1 parent 46ee045 commit ba4e051

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ GH := $(abspath $(TOOLS_BIN_DIR)/$(GH_BIN))
118118
# Registry / images
119119
TAG ?= dev
120120
ARCH ?= $(shell go env GOARCH)
121+
TARGET_PLATFORM = linux/$(ARCH)
121122
ALL_ARCH = amd64 arm64
122123
TARGET_PLATFORMS := linux/amd64,linux/arm64
123124
MACHINE := cluster-api-provider-rke2
@@ -328,9 +329,9 @@ docker-build: buildx-machine docker-pull-prerequisites
328329

329330

330331
.PHONY: docker-build-rke2-bootstrap
331-
docker-build-rke2-bootstrap:
332+
:
332333
DOCKER_BUILDKIT=1 BUILDX_BUILDER=$(MACHINE) docker buildx build \
333-
--platform linux/amd64 \
334+
--platform $(TARGET_PLATFORM) \
334335
--load \
335336
--build-arg builder_image=$(GO_CONTAINER_IMAGE) \
336337
--build-arg ARCH=$(ARCH) \
@@ -343,7 +344,7 @@ docker-build-rke2-bootstrap:
343344
.PHONY: docker-build-rke2-control-plane
344345
docker-build-rke2-control-plane:
345346
DOCKER_BUILDKIT=1 BUILDX_BUILDER=$(MACHINE) docker buildx build \
346-
--platform linux/amd64 \
347+
--platform $(TARGET_PLATFORM) \
347348
--load \
348349
--build-arg builder_image=$(GO_CONTAINER_IMAGE) \
349350
--build-arg ARCH=$(ARCH) \

test/e2e/config/e2e_conf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ providers:
6969
type: "url"
7070
contract: v1beta1
7171
files:
72-
- sourcePath: "../data/infrastructure/cluster-template-kcp-remediation.yaml"
72+
- sourcePath: "../data/infrastructure/cluster-template-rcp-remediation.yaml"
7373
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
7474
replacements:
7575
- old: "imagePullPolicy: Always"

0 commit comments

Comments
 (0)