From ea60b6206da21fdd4730e26733d51793b29af79a Mon Sep 17 00:00:00 2001 From: Akhilesh Verma Date: Thu, 21 Dec 2023 21:09:07 +0530 Subject: [PATCH 1/3] PE-3073: In ISO, support preloaded clusterConfig --- .arg.template | 3 ++- Earthfile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.arg.template b/.arg.template index 4b7acb3..c72706a 100644 --- a/.arg.template +++ b/.arg.template @@ -9,4 +9,5 @@ ARCH=amd64 HTTPS_PROXY= HTTP_PROXY= PROXY_CERT_PATH= -UPDATE_KERNEL=false \ No newline at end of file +UPDATE_KERNEL=false +CLUSTERCONFIG=spc.tgz \ No newline at end of file diff --git a/Earthfile b/Earthfile index d9e0949..fc6e382 100644 --- a/Earthfile +++ b/Earthfile @@ -129,6 +129,7 @@ build-iso: COPY overlay/files-iso/ /overlay/ COPY --if-exists user-data /overlay/files-iso/config.yaml COPY --if-exists content-*/*.zst /overlay/opt/spectrocloud/content/ + COPY --if-exists $CLUSTERCONFIG /overlay//opt/spectrocloud/clusterconfig/spc.tgz WORKDIR /build COPY --platform=linux/${ARCH} --keep-own +iso-image-rootfs/rootfs /build/image IF [ "$ARCH" = "arm64" ] From bd762e15eeb769692ed809c3cbaf59029031ed69 Mon Sep 17 00:00:00 2001 From: Akhilesh Verma Date: Thu, 21 Dec 2023 21:11:43 +0530 Subject: [PATCH 2/3] fix --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index fc6e382..32b8571 100644 --- a/Earthfile +++ b/Earthfile @@ -129,7 +129,7 @@ build-iso: COPY overlay/files-iso/ /overlay/ COPY --if-exists user-data /overlay/files-iso/config.yaml COPY --if-exists content-*/*.zst /overlay/opt/spectrocloud/content/ - COPY --if-exists $CLUSTERCONFIG /overlay//opt/spectrocloud/clusterconfig/spc.tgz + COPY --if-exists $CLUSTERCONFIG /overlay/opt/spectrocloud/clusterconfig/spc.tgz WORKDIR /build COPY --platform=linux/${ARCH} --keep-own +iso-image-rootfs/rootfs /build/image IF [ "$ARCH" = "arm64" ] From 1a6086774e6313e6da8713232fb17bbc14789570 Mon Sep 17 00:00:00 2001 From: Akhilesh Verma Date: Thu, 21 Dec 2023 22:05:19 +0530 Subject: [PATCH 3/3] add --- Earthfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Earthfile b/Earthfile index 32b8571..a4d0445 100644 --- a/Earthfile +++ b/Earthfile @@ -10,6 +10,7 @@ ARG IMAGE_REGISTRY ARG IMAGE_REPO=$OS_DISTRIBUTION ARG K8S_DISTRIBUTION ARG CUSTOM_TAG +ARG CLUSTERCONFIG ARG ARCH ARG PE_VERSION=v4.1.2 ARG SPECTRO_LUET_VERSION=v1.2.0