From 72106933c171a46612d9c1d8cab5082e116c04c2 Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Wed, 25 Oct 2023 17:01:06 -0400 Subject: [PATCH] tidy whitespace & remove oz's changes to default user-data template Signed-off-by: Tyler Gillson --- test/test-two-node.sh | 14 +++++++------- user-data.template | 13 ------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/test/test-two-node.sh b/test/test-two-node.sh index 54c84d7..d3fdb44 100755 --- a/test/test-two-node.sh +++ b/test/test-two-node.sh @@ -254,23 +254,23 @@ function create_userdata_isos() { } function build_provider_k3s() { - echo "Build provider-k3s image" - earthly +build-provider-package \ + echo "Build provider-k3s image" + earthly +build-provider-package \ --platform=linux/amd64 \ --IMAGE_REPOSITORY=${OCI_REGISTRY} \ --VERSION=${PROVIDER_K3S_HASH} - docker push ${OCI_REGISTRY}/provider-k3s:${PROVIDER_K3S_HASH} + docker push ${OCI_REGISTRY}/provider-k3s:${PROVIDER_K3S_HASH} } function build_stylus_package_and_framework() { - echo "Build stylus image and stylus framework image" - earthly --allow-privileged +package \ + echo "Build stylus image and stylus framework image" + earthly --allow-privileged +package \ --platform=linux/amd64 \ --IMAGE_REPOSITORY=${OCI_REGISTRY} \ --BASE_IMAGE=quay.io/kairos/core-opensuse-leap:v2.3.2 \ --VERSION=v0.0.0-${STYLUS_HASH} - docker push ${OCI_REGISTRY}/stylus-linux-amd64:v0.0.0-${STYLUS_HASH} - docker push ${OCI_REGISTRY}/stylus-framework-linux-amd64:v0.0.0-${STYLUS_HASH} + docker push ${OCI_REGISTRY}/stylus-linux-amd64:v0.0.0-${STYLUS_HASH} + docker push ${OCI_REGISTRY}/stylus-framework-linux-amd64:v0.0.0-${STYLUS_HASH} } function build_canvos() { diff --git a/user-data.template b/user-data.template index d963177..bb2d503 100644 --- a/user-data.template +++ b/user-data.template @@ -1,12 +1,4 @@ #cloud-config - -# This is currently required to enable a two node cluster -# should be removed in the future and only the twoNode section -# in stylus should control this. -cluster: - env: - two-node: "true" - stylus: site: # host for hubble api to register device. @@ -22,11 +14,6 @@ stylus: key1: value1 key2: value2 key3: value3 - # enable two node cluster and add a custom health check script - # see also Dockerfile on how to add this script to the image - twoNode: - enabled: true - health-check-script: /opt/spectrocloud/bin/custom-health-check.sh # name of the device, this may also be referred to as the edge id or edge host id. If no edge host name is specified # one will be generated from the device serial number. If stylus cannot the device serial number a random id will