From f58126e914aebc74f3b1abc52225cc6be6a466fe Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Wed, 10 Sep 2025 16:14:54 +0200 Subject: [PATCH 1/3] Updating OWNERS file --- OWNERS | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/OWNERS b/OWNERS index 68a6ef1f91..950947cb9b 100644 --- a/OWNERS +++ b/OWNERS @@ -1,22 +1,7 @@ # See the OWNERS docs: approvers: - - sig-cluster-lifecycle-leads - - cluster-api-aws-admins - - cluster-api-aws-maintainers + - capi-admins reviewers: - - cluster-api-aws-admins - - cluster-api-aws-maintainers - - cluster-api-aws-reviewers - -emeritus_approvers: - - AverageMarcus - - chuckha - - detiber - - ncdc - - randomvariable - - rudoi - - sedefsavas - - Skarlso - - vincepri + - capi-admins From 2216e81ae6b604ecf716cad4b89f33dbacb4a047 Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Wed, 10 Sep 2025 18:07:32 +0200 Subject: [PATCH 2/3] Update OWNERS_ALIASES --- OWNERS_ALIASES | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 6c1b8e17f4..d0b5f7d4d5 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -1,22 +1,8 @@ # See the OWNERS docs: aliases: - sig-cluster-lifecycle-leads: - - fabriziopandini - - justinsb - - neolit123 - - vincepri - cluster-api-aws-admins: - - richardcase - cluster-api-aws-maintainers: - - richardcase - - Ankitasw - - dlipovetsky - - nrb - - AndiDog - cluster-api-aws-reviewers: - - luthermonson - - cnmcavoy - - faiq - - fiunchinho - - damdo + capi-admin: + - serngawy + - marek-veber + - mzazrivec + - RadekCap From b69e87af4f3f573fc252115d12ad0c2444732254 Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Mon, 15 Sep 2025 12:42:49 +0200 Subject: [PATCH 3/3] Konflux build changes --- stolostron/Dockerfile.stolostron | 30 ++++++++++++++++++++++++++++++ stolostron/Makefile | 8 ++++++++ 2 files changed, 38 insertions(+) create mode 100644 stolostron/Dockerfile.stolostron create mode 100644 stolostron/Makefile diff --git a/stolostron/Dockerfile.stolostron b/stolostron/Dockerfile.stolostron new file mode 100644 index 0000000000..c2313f0b1c --- /dev/null +++ b/stolostron/Dockerfile.stolostron @@ -0,0 +1,30 @@ +FROM registry.access.redhat.com/ubi8/go-toolset:1.24.6-1755529056 AS toolchain + +# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy +ARG goproxy=https://proxy.golang.org +ENV GOPROXY=$goproxy + +FROM toolchain AS builder + +ENV GOPATH=/opt/app-root/src/go +ENV GOFLAGS="-buildvcs=false" + +COPY . . + +# Cache deps before building and copying source so that we don't need to re-download as much +# and so that source changes don't invalidate our downloaded layer +RUN --mount=type=cache,target=/root/.local/share/golang \ + --mount=type=cache,target=/go/pkg/mod \ + go mod download + +# Build +ARG package=. +RUN --mount=type=cache,target=/root/.cache/go-build \ + --mount=type=cache,target=/go/pkg/mod \ + --mount=type=cache,target=/root/.local/share/golang \ + CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -ldflags "-extldflags '-static'" -o manager ${package} + +# Copy the controller-manager into a thin image +FROM registry.access.redhat.com/ubi9/ubi:9.6-1754380668 +COPY --from=builder /opt/app-root/src/manager /bin/cluster-api-provider-aws-controller-manager +ENTRYPOINT ["/bin/cluster-api-provider-aws-controller-manager"] diff --git a/stolostron/Makefile b/stolostron/Makefile new file mode 100644 index 0000000000..9394181f61 --- /dev/null +++ b/stolostron/Makefile @@ -0,0 +1,8 @@ +IMG_REG ?= registry.redhat.io +IMG_REPO ?= multicluster +IMG_NAME ?= cluster-api-provider-aws-rhel9 +IMG_TAG ?= latest +IMG ?= ${IMG_REG}/${IMG_REPO}/${IMG_NAME}:${IMG_TAG} + +docker-build: + docker build -f Dockerfile.stolostron ../ -t ${IMG}