From 95558f7da8b4855bb1b21b9aeba8a4124a3c68a6 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 20 Jun 2024 13:43:04 +0200 Subject: [PATCH] add initial arm support Signed-off-by: Andrei Kvapil --- packages/apps/kubernetes/values.yaml | 8 ++++++++ packages/core/installer/Makefile | 1 + packages/core/installer/images/cozystack.json | 10 ++++++++-- packages/core/installer/images/cozystack.tag | 2 +- packages/core/installer/images/cozystack/Dockerfile | 5 ++++- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/apps/kubernetes/values.yaml b/packages/apps/kubernetes/values.yaml index 15b5cc2b..1631700b 100644 --- a/packages/apps/kubernetes/values.yaml +++ b/packages/apps/kubernetes/values.yaml @@ -16,3 +16,11 @@ nodeGroups: resources: cpu: 2 memory: 1024Mi + +## @param addons [object] addons configuration +## +addons: + ingressNginx: + enabled: true + nodeGroups: + - md0 diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index 7cea7ed7..090cb4b0 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -25,6 +25,7 @@ image-cozystack: --provenance false \ --tag $(REGISTRY)/cozystack:$(call settag,$(TAG)) \ --cache-from type=registry,ref=$(REGISTRY)/cozystack:latest \ + --platform linux/amd64,linux/arm64 \ --cache-to type=inline \ --metadata-file images/cozystack.json \ --push=$(PUSH) \ diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json index 585f11e3..63a732c3 100644 --- a/packages/core/installer/images/cozystack.json +++ b/packages/core/installer/images/cozystack.json @@ -1,4 +1,10 @@ { - "containerimage.config.digest": "sha256:6d54a5b971e80fbaace664054d4e67f24fd1fbb7807ebaffd036d4ea7195df10", - "containerimage.digest": "sha256:a6b167235d8556ff7e45f4582c2491a2ad48292a46005dcf767908e2fb78e74e" + "buildx.build.ref": "youthful_hertz/youthful_hertz0/aafwjh8j28i98f59smgh3qe86", + "containerimage.descriptor": { + "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json", + "digest": "sha256:e0c0defb9f5b10f5187d4002ccec7d01841e96c7350963f253003c0efeff6cef", + "size": 685 + }, + "containerimage.digest": "sha256:e0c0defb9f5b10f5187d4002ccec7d01841e96c7350963f253003c0efeff6cef", + "image.name": "ghcr.io/aenix-io/cozystack/cozystack:latest" } \ No newline at end of file diff --git a/packages/core/installer/images/cozystack.tag b/packages/core/installer/images/cozystack.tag index e8430b50..602d7b26 100644 --- a/packages/core/installer/images/cozystack.tag +++ b/packages/core/installer/images/cozystack.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/cozystack:v0.7.0 +ghcr.io/aenix-io/cozystack/cozystack:latest diff --git a/packages/core/installer/images/cozystack/Dockerfile b/packages/core/installer/images/cozystack/Dockerfile index 6618cd00..7c9652b3 100644 --- a/packages/core/installer/images/cozystack/Dockerfile +++ b/packages/core/installer/images/cozystack/Dockerfile @@ -3,12 +3,15 @@ FROM golang:alpine3.19 as k8s-await-election-builder ARG K8S_AWAIT_ELECTION_GITREPO=https://github.com/LINBIT/k8s-await-election ARG K8S_AWAIT_ELECTION_VERSION=0.4.1 +# TARGETARCH is a docker special variable: https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope +ARG TARGETARCH + RUN apk add --no-cache git make RUN git clone ${K8S_AWAIT_ELECTION_GITREPO} /usr/local/go/k8s-await-election/ \ && cd /usr/local/go/k8s-await-election \ && git reset --hard v${K8S_AWAIT_ELECTION_VERSION} \ && make \ - && mv ./out/k8s-await-election-amd64 /k8s-await-election + && mv ./out/k8s-await-election-${TARGETARCH} /k8s-await-election FROM alpine:3.19 AS builder