Skip to content

feat: enable ARM64 builds for Linstor and Dashboard #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kingdonb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: enable ARM64 builds for Linstor and Dashboard #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/build-talos-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,13 @@ jobs:
cd cozystack-upstream
git checkout v1.4.0

- name: Apply ARM64 patches
- name: Apply ARM64 patches (shared build)
run: |
cd cozystack-upstream
git apply ../patches/04-arm64-default-platform.patch
git apply ../patches/06-kubeovn-manifest-list-retag.patch
git apply ../patches/07-arm64-skip-amd64-only-builds.patch
git apply ../patches/09-arm64-linstor-dashboard.patch

- name: Build parallel package group
run: |
Expand All @@ -131,9 +132,9 @@ jobs:
export PUSH=1

if [ "$GROUP" = "apps" ]; then
DIRS="packages/apps/http-cache packages/apps/mariadb packages/apps/clickhouse packages/apps/kubernetes"
DIRS="packages/apps/http-cache packages/apps/mariadb packages/apps/clickhouse packages/apps/kubernetes packages/system/dashboard"
elif [ "$GROUP" = "system-base" ]; then
DIRS="packages/system/monitoring packages/system/cozystack-api packages/system/cozystack-controller packages/system/backup-controller packages/system/backupstrategy-controller packages/system/lineage-controller-webhook"
DIRS="packages/system/monitoring packages/system/cozystack-api packages/system/cozystack-controller packages/system/backup-controller packages/system/backupstrategy-controller packages/system/lineage-controller-webhook packages/system/linstor packages/system/linstor-gui"
elif [ "$GROUP" = "system-net" ]; then
DIRS="packages/system/cilium packages/system/kubeovn packages/system/kubeovn-webhook packages/system/kubeovn-plunger"
elif [ "$GROUP" = "system-cloud" ]; then
Expand Down Expand Up @@ -195,6 +196,7 @@ jobs:
git apply ../patches/04-arm64-default-platform.patch
git apply ../patches/06-kubeovn-manifest-list-retag.patch
git apply ../patches/07-arm64-skip-amd64-only-builds.patch
git apply ../patches/09-arm64-linstor-dashboard.patch

- name: Build operator and manifests
run: |
Expand Down Expand Up @@ -257,6 +259,9 @@ jobs:
git apply ../patches/01-arm64-spin-tailscale.patch
fi
git apply ../patches/02-makefile-architecture-variables.patch
git apply ../patches/06-kubeovn-manifest-list-retag.patch
git apply ../patches/07-arm64-skip-amd64-only-builds.patch
git apply ../patches/09-arm64-linstor-dashboard.patch
chmod +x packages/core/talos/hack/gen-profiles.sh
chmod +x packages/core/talos/hack/gen-versions.sh

Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/release-talos-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
git apply ../patches/04-arm64-default-platform.patch
git apply ../patches/06-kubeovn-manifest-list-retag.patch
git apply ../patches/07-arm64-skip-amd64-only-builds.patch
git apply ../patches/09-arm64-linstor-dashboard.patch

- name: Build parallel package group
run: |
Expand All @@ -75,9 +76,9 @@ jobs:
export PUSH=1

if [ "$GROUP" = "apps" ]; then
DIRS="packages/apps/http-cache packages/apps/mariadb packages/apps/clickhouse packages/apps/kubernetes"
DIRS="packages/apps/http-cache packages/apps/mariadb packages/apps/clickhouse packages/apps/kubernetes packages/system/dashboard"
elif [ "$GROUP" = "system-base" ]; then
DIRS="packages/system/monitoring packages/system/cozystack-api packages/system/cozystack-controller packages/system/backup-controller packages/system/backupstrategy-controller packages/system/lineage-controller-webhook"
DIRS="packages/system/monitoring packages/system/cozystack-api packages/system/cozystack-controller packages/system/backup-controller packages/system/backupstrategy-controller packages/system/lineage-controller-webhook packages/system/linstor packages/system/linstor-gui"
elif [ "$GROUP" = "system-net" ]; then
DIRS="packages/system/cilium packages/system/kubeovn packages/system/kubeovn-webhook packages/system/kubeovn-plunger"
elif [ "$GROUP" = "system-cloud" ]; then
Expand Down Expand Up @@ -142,6 +143,7 @@ jobs:
git apply ../patches/04-arm64-default-platform.patch
git apply ../patches/06-kubeovn-manifest-list-retag.patch
git apply ../patches/07-arm64-skip-amd64-only-builds.patch
git apply ../patches/09-arm64-linstor-dashboard.patch

- name: Build operator and manifests
run: |
Expand Down Expand Up @@ -206,6 +208,9 @@ jobs:
git apply ../patches/01-arm64-spin-tailscale.patch
fi
git apply ../patches/02-makefile-architecture-variables.patch
git apply ../patches/06-kubeovn-manifest-list-retag.patch
git apply ../patches/07-arm64-skip-amd64-only-builds.patch
git apply ../patches/09-arm64-linstor-dashboard.patch
chmod +x packages/core/talos/hack/gen-profiles.sh
chmod +x packages/core/talos/hack/gen-versions.sh

Expand Down Expand Up @@ -265,6 +270,9 @@ jobs:
git apply ../patches/04-arm64-default-platform.patch
git apply ../patches/03-arm64-spin-only.patch
git apply ../patches/02-makefile-architecture-variables.patch
git apply ../patches/06-kubeovn-manifest-list-retag.patch
git apply ../patches/07-arm64-skip-amd64-only-builds.patch
git apply ../patches/09-arm64-linstor-dashboard.patch
chmod +x packages/core/talos/hack/gen-profiles.sh
chmod +x packages/core/talos/hack/gen-versions.sh

Expand Down
25 changes: 6 additions & 19 deletions patches/07-arm64-skip-amd64-only-builds.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
diff --git a/Makefile b/Makefile
index 842a3e7..f49c917 100644
index 5041ac6..842a3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,9 @@ build: build-deps
make -C packages/system/backupstrategy-controller image
make -C packages/system/lineage-controller-webhook image
@@ -23,6 +23,7 @@ build: build-deps
make -C packages/system/cilium image
- make -C packages/system/linstor image
- make -C packages/system/linstor-gui image
make -C packages/system/kubeovn image
make -C packages/system/linstor image
make -C packages/system/linstor-gui image
+ make -C packages/system/kubeovn image
make -C packages/system/kubeovn-webhook image
make -C packages/system/kubeovn-plunger image
- make -C packages/system/dashboard image
make -C packages/system/metallb image
make -C packages/system/kamaji image
make -C packages/system/multus image
@@ -34,7 +31,6 @@ build: build-deps
make -C packages/system/objectstorage-controller image
make -C packages/system/grafana-operator image
make -C packages/core/testing image
- make -C packages/core/talos image
make -C packages/core/platform image
make -C packages/core/installer image
make manifests
make -C packages/system/dashboard image
56 changes: 56 additions & 0 deletions patches/09-arm64-linstor-dashboard.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile
index 44b6f27..8ae86bf 100644
--- a/packages/system/dashboard/Makefile
+++ b/packages/system/dashboard/Makefile
@@ -24,7 +24,7 @@ build-console:
--file .tmp-cozystack-ui/Containerfile \
--provenance false \
--builder=$(BUILDER) \
- --platform=linux/amd64 \
+ \
--tag $(REGISTRY)/cozystack-ui:$(call settag,$(TAG)) \
--cache-from type=registry,ref=$(REGISTRY)/cozystack-ui:latest \
--cache-to type=inline \
@@ -45,7 +45,7 @@ image-token-proxy:
docker buildx build images/token-proxy \
--provenance false \
--builder=$(BUILDER) \
- --platform=linux/amd64 \
+ \
--tag $(REGISTRY)/token-proxy:$(call settag,$(TAG)) \
--cache-from type=registry,ref=$(REGISTRY)/token-proxy:latest \
--cache-to type=inline \
diff --git a/packages/system/linstor/images/piraeus-server/patches/arm64-protoc.diff b/packages/system/linstor/images/piraeus-server/patches/arm64-protoc.diff
new file mode 100644
index 0000000..c645ddd
--- /dev/null
+++ b/packages/system/linstor/images/piraeus-server/patches/arm64-protoc.diff
@@ -0,0 +1,28 @@
+diff --git a/build.gradle b/build.gradle
+index e16793b..f34d70b 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -580,7 +580,7 @@ tasks.register('unzipProtoc', Copy) {
+ dependsOn(downloadProtoc)
+
+- def zipFile = file("tools/protoc-" + protobufVersion + '-linux-x86_64.zip')
++ def zipFile = file("tools/protoc-" + protobufVersion + '-linux-aarch_64.zip')
+ def outputDir = file("tools/protoc-" + protobufVersion)
+
+ from zipTree(zipFile)
+@@ -594,7 +594,7 @@ tasks.register('downloadProtoc') {
+- def protozip = new File("${projectDir}/tools/protoc-" + protobufVersion + '-linux-x86_64.zip')
++ def protozip = new File("${projectDir}/tools/protoc-" + protobufVersion + '-linux-aarch_64.zip')
+ outputs.file protozip
+
+ doLast {
+ if (!protozip.exists()) {
+ mkdir "tools"
+ println "downloading protoc..."
+ new URL('https://github.com/google/protobuf/releases/download/v'
+- + protobufVersion + '/protoc-' + protobufVersion + '-linux-x86_64.zip')
++ + protobufVersion + '/protoc-' + protobufVersion + '-linux-aarch_64.zip')
+ .withInputStream { i -> protozip.withOutputStream { it << i } }
+ }
+ }
+ }
Loading