Skip to content

Commit edaf552

Browse files
committed
use edge bootstrap command
1 parent 270dee5 commit edaf552

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

images/plural-bundle/assets/job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
containers:
4242
- name: plural-cloud
4343
image: "@BASE_IMAGE@"
44-
args: ["cd", "clusters", "bootstrap", "--project", "@PROJECT@", "--name", "@CLUSTER_NAME@", "--tag", "@TAG@"]
44+
args: ["edge", "bootstrap", "--machine-id", "@MACHINE_ID@"]
4545
env:
4646
- name: PLURAL_CONSOLE_TOKEN
4747
value: "@TOKEN@"

images/plural-bundle/run.sh

+2-23
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ set -ex
44

55
K3S_MANIFEST_DIR=${K3S_MANIFEST_DIR:-/var/lib/rancher/k3s/server/manifests/}
66

7-
# DEFAULTS
87
# renovate: datasource=docker depName=ghcr.io/pluralsh/plural-cli-cloud
9-
BASE_IMAGE="ghcr.io/pluralsh/kairos-plural-cli:0.11.1"
8+
BASE_IMAGE="ghcr.io/pluralsh/kairos-plural-cli:bootstrap" # TODO: Revert once https://github.com/pluralsh/plural-cli/pull/598 will be merged.
109
TOKEN=""
1110
URL=""
12-
CLUSTER_NAME_PREFIX="plural-edge"
13-
PROJECT="default"
14-
TAG="plural=edge"
1511

1612
getConfig() {
1713
local l=$1
@@ -44,21 +40,6 @@ readConfig() {
4440
if [ "$_url" != "" ]; then
4541
URL=$_url
4642
fi
47-
48-
_clusterNamePrefix=$(getConfig plural.clusterNamePrefix)
49-
if [ "$_clusterNamePrefix" != "" ]; then
50-
CLUSTER_NAME_PREFIX=$_clusterNamePrefix
51-
fi
52-
53-
_project=$(getConfig plural.project)
54-
if [ "$_project" != "" ]; then
55-
PROJECT=$_project
56-
fi
57-
58-
_tag=$(getConfig plural.tag)
59-
if [ "$_tag" != "" ]; then
60-
TAG=$_tag
61-
fi
6243
}
6344

6445
mkdir -p "${K3S_MANIFEST_DIR}"
@@ -70,9 +51,7 @@ for FILE in assets/*; do
7051
templ "BASE_IMAGE" "${BASE_IMAGE}" "${FILE}"
7152
templ "TOKEN" "${TOKEN}" "${FILE}"
7253
templ "URL" "${URL}" "${FILE}"
73-
templ "CLUSTER_NAME" "${CLUSTER_NAME_PREFIX}-$(cut -c1-10 < /etc/plural-id)" "${FILE}"
74-
templ "PROJECT" "${PROJECT}" "${FILE}"
75-
templ "TAG" "${TAG}" "${FILE}"
54+
templ "MACHINE_ID" "$(cat /etc/plural-id)" "${FILE}"
7655
done;
7756

7857
cp -rfv assets/* "${K3S_MANIFEST_DIR}"

0 commit comments

Comments
 (0)