From f2c7e6c18ce72692038ba23ea59a8faf1d866ed1 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Thu, 29 Aug 2024 15:49:13 -0700 Subject: [PATCH 1/3] build arm64 operator image --- operator/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/operator/Makefile b/operator/Makefile index 712d33b09..68301f178 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -153,6 +153,7 @@ export APKO_CONFIG := deploy/apko.tmpl.yaml build-operator-image: melange-build-operator apko-build .PHONY: build-and-push-operator-image +build-and-push-operator-image: ARCHS ?= arm64 build-and-push-operator-image: melange-build-operator apko-build-and-publish .PHONY: build-chart From 6a97d8a3477c00145a96a2cd6986b22ed814902b Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Thu, 29 Aug 2024 15:52:00 -0700 Subject: [PATCH 2/3] updates --- common.mk | 8 ++++---- operator/Makefile | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common.mk b/common.mk index 46ac526aa..cbae94b31 100644 --- a/common.mk +++ b/common.mk @@ -43,14 +43,14 @@ $(MELANGE_CACHE_DIR): mkdir -p $(MELANGE_CACHE_DIR) .PHONY: apko-build -apko-build: ARCHS ?= amd64 +apko-build: ARCHS ?= arm64 apko-build: check-env-IMAGE apko-template cd build && ${APKO_CMD} \ build apko.yaml ${IMAGE} apko.tar \ --arch ${ARCHS} .PHONY: apko-build-and-publish -apko-build-and-publish: ARCHS ?= amd64 +apko-build-and-publish: ARCHS ?= arm64 apko-build-and-publish: check-env-IMAGE apko-template @bash -c 'set -o pipefail && cd build && ${APKO_CMD} publish apko.yaml ${IMAGE} --arch ${ARCHS} | tee digest' $(MAKE) apko-output-image @@ -64,7 +64,7 @@ apko-login: --password "${PASSWORD}" "${REGISTRY}" .PHONY: apko-print-pkg-version -apko-print-pkg-version: ARCHS ?= amd64 +apko-print-pkg-version: ARCHS ?= arm64 apko-print-pkg-version: apko-template check-env-PACKAGE_NAME cd build && \ ${APKO_CMD} show-packages apko.yaml --arch=${ARCHS} | \ @@ -83,7 +83,7 @@ apko-output-image: echo "$(IMAGE)@$$digest" > build/image .PHONY: melange-build -melange-build: ARCHS ?= amd64 +melange-build: ARCHS ?= arm64 melange-build: MELANGE_SOURCE_DIR ?= . melange-build: $(MELANGE_CACHE_DIR) melange-template ${MELANGE_CMD} \ diff --git a/operator/Makefile b/operator/Makefile index 68301f178..712d33b09 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -153,7 +153,6 @@ export APKO_CONFIG := deploy/apko.tmpl.yaml build-operator-image: melange-build-operator apko-build .PHONY: build-and-push-operator-image -build-and-push-operator-image: ARCHS ?= arm64 build-and-push-operator-image: melange-build-operator apko-build-and-publish .PHONY: build-chart From cc24de85aa8a48687a56a30a76a59654211295fa Mon Sep 17 00:00:00 2001 From: sgalsaleh <39952863+sgalsaleh@users.noreply.github.com> Date: Fri, 30 Aug 2024 17:49:25 +0000 Subject: [PATCH 3/3] Update image versions --- pkg/addons/openebs/static/metadata.yaml | 6 +++--- pkg/addons/openebs/static/values.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/addons/openebs/static/metadata.yaml b/pkg/addons/openebs/static/metadata.yaml index 012f73277..1583ccf2c 100644 --- a/pkg/addons/openebs/static/metadata.yaml +++ b/pkg/addons/openebs/static/metadata.yaml @@ -10,10 +10,10 @@ location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts images: kubectl: repo: proxy.replicated.com/anonymous/replicated/ec-kubectl - tag: 1.31.0-r1@sha256:70b2e76f316eb753b70d1349861d9b5bd58fff2cfa551072917dd68b50bdb2af + tag: 1.31.0-r1@sha256:8e0463ce20811f258ef75a858dd2590b2c3c76a3c9670fe443ef23da70cc47ee openebs-linux-utils: repo: proxy.replicated.com/anonymous/replicated/ec-openebs-linux-utils - tag: 4.1.0@sha256:ba8167bbcaedd43a8be53325122566a3e6c0ee336daf2a3b5c396c7773db2611 + tag: 4.1.0@sha256:a1947ec08fcede8cf38fc7d940dbdd1c08bb5435c0ff71e6382def08c8fe7e1f openebs-provisioner-localpv: repo: proxy.replicated.com/anonymous/replicated/ec-openebs-provisioner-localpv - tag: 4.1.0-r0@sha256:77f54b4935376a4fe460853eb1eb3582ec1301f94ff61929444ddae2e8473972 + tag: 4.1.0-r0@sha256:9432a4e648a976e88d13cc56de6fcbbb03dac5d908a451db30fc6d95e78bd427 diff --git a/pkg/addons/openebs/static/values.yaml b/pkg/addons/openebs/static/values.yaml index 9cb5890a7..5771cb4a1 100644 --- a/pkg/addons/openebs/static/values.yaml +++ b/pkg/addons/openebs/static/values.yaml @@ -27,7 +27,7 @@ localpv-provisioner: image: registry: proxy.replicated.com/anonymous/ repository: 'replicated/ec-openebs-linux-utils' - tag: '4.1.0@sha256:ba8167bbcaedd43a8be53325122566a3e6c0ee336daf2a3b5c396c7773db2611' + tag: '4.1.0@sha256:a1947ec08fcede8cf38fc7d940dbdd1c08bb5435c0ff71e6382def08c8fe7e1f' hostpathClass: enabled: true isDefaultClass: true @@ -35,7 +35,7 @@ localpv-provisioner: image: registry: proxy.replicated.com/anonymous/ repository: 'replicated/ec-openebs-provisioner-localpv' - tag: '4.1.0-r0@sha256:77f54b4935376a4fe460853eb1eb3582ec1301f94ff61929444ddae2e8473972' + tag: '4.1.0-r0@sha256:9432a4e648a976e88d13cc56de6fcbbb03dac5d908a451db30fc6d95e78bd427' lvm-localpv: enabled: false mayastor: @@ -44,6 +44,6 @@ preUpgradeHook: image: registry: proxy.replicated.com/anonymous repo: 'replicated/ec-kubectl' - tag: '1.31.0-r1@sha256:70b2e76f316eb753b70d1349861d9b5bd58fff2cfa551072917dd68b50bdb2af' + tag: '1.31.0-r1@sha256:8e0463ce20811f258ef75a858dd2590b2c3c76a3c9670fe443ef23da70cc47ee' zfs-localpv: enabled: false