Skip to content

Commit 9cbd1b7

Browse files
akosmaakosma
authored
Merge pull request #6 from projectsyn/update
Updated tutorial to latest versions of Syn components
2 parents 2b35ac5 + d9a235e commit 9cbd1b7

18 files changed

Lines changed: 236 additions & 372 deletions

‎0_requirements.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ trim () {
88
}
99

1010
NGROK_VERSION=$(ngrok version)
11-
echo $NGROK_VERSION
11+
echo "$NGROK_VERSION"
1212

1313
DOCKER_VERSION=$(docker version | grep Version -m 1)
1414
DOCKER_VERSION=$(trim "$DOCKER_VERSION")
@@ -18,10 +18,10 @@ PODMAN_VERSION=$(podman version | grep Version -m 1)
1818
echo "Podman $PODMAN_VERSION"
1919

2020
MINIKUBE_VERSION=$(minikube version | grep version)
21-
echo $MINIKUBE_VERSION
21+
echo "$MINIKUBE_VERSION"
2222

2323
K3D_VERSION=$(k3d version | grep version -m 1)
24-
echo $K3D_VERSION
24+
echo "$K3D_VERSION"
2525

2626
VSCODE_PATH=$(which code)
2727
echo "Visual Studio Code: $VSCODE_PATH"

‎1_lieutenant_on_minikube.sh‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,40 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
34
source lib/functions.sh
45
source lib/minikube.sh
56

6-
check_variable "GITLAB_TOKEN" $GITLAB_TOKEN
7-
check_variable "GITLAB_ENDPOINT" $GITLAB_ENDPOINT
8-
check_variable "GITLAB_USERNAME" $GITLAB_USERNAME
7+
check_variable "GITLAB_TOKEN" "$GITLAB_TOKEN"
8+
check_variable "GITLAB_ENDPOINT" "$GITLAB_ENDPOINT"
9+
check_variable "GITLAB_USERNAME" "$GITLAB_USERNAME"
910

1011
# Minikube must be running
11-
minikube start --memory 4096 --disk-size 60g --cpus 4
12+
minikube start --disk-size 60g --cpus 4
1213
check_minikube
1314

1415
echo "===> Creating namespace"
1516
kubectl create namespace lieutenant
1617

1718
echo "===> CRDs (global scope)"
18-
kubectl apply -k github.com/projectsyn/lieutenant-operator/deploy/crds
19+
kubectl apply -k github.com/projectsyn/lieutenant-operator/deploy/crds?ref=v0.5.2
1920

2021
echo "===> Operator deployment"
21-
kubectl -n lieutenant apply -k github.com/projectsyn/lieutenant-operator/deploy
22+
kubectl -n lieutenant apply -k github.com/projectsyn/lieutenant-operator/deploy?ref=v0.5.2
2223

2324
echo "===> Operator configuration"
2425
kubectl -n lieutenant set env deployment/lieutenant-operator -c lieutenant-operator \
25-
SKIP_VAULT_SETUP=true \
2626
DEFAULT_DELETION_POLICY=Delete \
27-
LIEUTENANT_DELETE_PROTECTION=false
27+
DEFAULT_GLOBAL_GIT_REPO_URL=https://github.com/projectsyn/getting-started-commodore-defaults \
28+
LIEUTENANT_DELETE_PROTECTION=false \
29+
SKIP_VAULT_SETUP=true
2830

2931
# tag::demo[]
3032
echo "===> API deployment"
31-
kubectl -n lieutenant apply -k "github.com/projectsyn/lieutenant-api/deploy?ref=v0.2.0"
33+
kubectl -n lieutenant apply -k "github.com/projectsyn/lieutenant-api/deploy?ref=v0.5.0"
34+
35+
echo "===> API configuration"
36+
kubectl -n lieutenant set env deployment/lieutenant-api -c lieutenant-api \
37+
DEFAULT_API_SECRET_REF_NAME=gitlab-com
3238

3339
echo "===> For Minikube we must delete the default service and re-create it"
3440
kubectl -n lieutenant delete svc lieutenant-api
@@ -46,22 +52,33 @@ echo "===> Lieutenant API: $LIEUTENANT_URL"
4652
wait_for_lieutenant "$LIEUTENANT_URL/healthz"
4753

4854
echo "===> Prepare Lieutenant Operator access to GitLab"
49-
kubectl -n lieutenant create secret generic vshn-gitlab \
50-
--from-literal=endpoint="https://gitlab.com" \
51-
--from-literal=hostKeys="$(ssh-keyscan gitlab.com)" \
55+
kubectl -n lieutenant create secret generic gitlab-com \
56+
--from-literal=endpoint="https://${GITLAB_ENDPOINT}" \
57+
--from-literal=hostKeys="$(ssh-keyscan $GITLAB_ENDPOINT)" \
5258
--from-literal=token="$GITLAB_TOKEN"
5359

5460
echo "===> Prepare Lieutenant API Authentication and Authorization"
5561
kubectl -n lieutenant apply -f lib/auth.yaml
5662

5763
echo "===> Create Lieutenant Objects: Tenant and Cluster"
58-
LIEUTENANT_TOKEN=$(kubectl -n lieutenant get secret $(kubectl -n lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}') -o go-template='{{.data.token | base64decode}}')
64+
LIEUTENANT_TOKEN=$(kubectl -n lieutenant get secret "$(kubectl -n lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}')" -o go-template='{{.data.token | base64decode}}')
5965
LIEUTENANT_AUTH="Authorization: Bearer ${LIEUTENANT_TOKEN}"
6066

6167
echo "===> Create a Lieutenant Tenant via the API"
62-
TENANT_ID=$(curl -s -H "$LIEUTENANT_AUTH" -H "Content-Type: application/json" -X POST --data "{\"displayName\":\"Tutorial Tenant\",\"gitRepo\":{\"url\":\"ssh://git@${GITLAB_ENDPOINT}/${GITLAB_USERNAME}/tutorial-tenant.git\"}}" "${LIEUTENANT_URL}/tenants" | jq -r ".id")
68+
TENANT_ID=$(curl -s -H "$LIEUTENANT_AUTH" -H "Content-Type: application/json" -X POST --data "{\"displayName\":\"Tutorial Tenant\",\"gitRepo\":{\"url\":\"ssh://git@${GITLAB_ENDPOINT}/${GITLAB_USERNAME}/tutorial-tenant.git\"},\"globalGitRepoRevision\":\"v0.5.0\"}" "${LIEUTENANT_URL}/tenants" | jq -r ".id")
6369
echo "Tenant ID: $TENANT_ID"
6470

71+
echo "===> Patch the Tenant object to add a cluster template"
72+
kubectl -n lieutenant patch tenant "$TENANT_ID" --type="merge" -p \
73+
"{\"spec\":{\"clusterTemplate\": {
74+
\"gitRepoTemplate\": {
75+
\"apiSecretRef\":{\"name\":\"gitlab-com\"},
76+
\"path\":\"${GITLAB_USERNAME}\",
77+
\"repoName\":\"{{ .Name }}\"
78+
},
79+
\"tenantRef\":{}
80+
}}}"
81+
6582
echo "===> Retrieve the registered Tenants via API and directly on the cluster"
6683
curl -H "$LIEUTENANT_AUTH" "${LIEUTENANT_URL}/tenants"
6784
kubectl -n lieutenant get tenant

‎2_commodore_on_minikube.sh‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,32 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
34
source lib/functions.sh
45
source lib/minikube.sh
56

6-
check_variable "COMMODORE_SSH_PRIVATE_KEY" $COMMODORE_SSH_PRIVATE_KEY
7-
check_variable "GITLAB_ENDPOINT" $GITLAB_ENDPOINT
8-
check_variable "GITHUB_USERNAME" $GITHUB_USERNAME
7+
check_variable "COMMODORE_SSH_PRIVATE_KEY" "$COMMODORE_SSH_PRIVATE_KEY"
8+
check_variable "GITLAB_ENDPOINT" "$GITLAB_ENDPOINT"
9+
check_variable "GITHUB_USERNAME" "$GITHUB_USERNAME"
910

1011
check_minikube
1112

12-
echo "===> Find commodore-defaults repository fork on GitHub"
13-
GITHUB_COMMODORE_URL=https://github.com/$GITHUB_USERNAME/commodore-defaults
14-
GITHUB_COMMODORE_DEFAULTS=$(curl $GITHUB_COMMODORE_URL --head --silent | grep "HTTP/1.1 200 OK")
15-
if [ -z "$GITHUB_COMMODORE_DEFAULTS" ]; then
16-
echo "===> ERROR: You must fork the https://github.com/projectsyn/commodore-defaults before running this script"
17-
exit 1
18-
fi
19-
echo "===> OK: commodore defaults forked: $GITHUB_COMMODORE_DEFAULTS"
20-
2113
echo "===> Find Lieutenant URL"
2214
LIEUTENANT_URL=$(curl http://localhost:4040/api/tunnels --silent | jq -r '.["tunnels"][0]["public_url"]')
23-
check_variable "LIEUTENANT_URL" $LIEUTENANT_URL
15+
check_variable "LIEUTENANT_URL" "$LIEUTENANT_URL"
2416

2517
echo "===> Find Cluster ID"
2618
CLUSTER_ID=$(kubectl --context minikube -n lieutenant get cluster | grep c- | awk 'NR==1{print $1}')
27-
check_variable "CLUSTER_ID" $CLUSTER_ID
19+
check_variable "CLUSTER_ID" "$CLUSTER_ID"
2820

2921
echo "===> Find Lieutenant Token"
30-
LIEUTENANT_TOKEN=$(kubectl --context minikube -n lieutenant get secret $(kubectl -n lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}') -o go-template='{{.data.token | base64decode}}')
22+
LIEUTENANT_TOKEN=$(kubectl --context minikube -n lieutenant get secret "$(kubectl -n lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}')" -o go-template='{{.data.token | base64decode}}')
3123

3224
echo "===> Kickstart Commodore"
3325
echo "===> IMPORTANT: When prompted enter your SSH key password"
3426
kubectl -n lieutenant run commodore-shell \
35-
--image=docker.io/projectsyn/commodore:v0.3.0 \
27+
--image=docker.io/projectsyn/commodore:v0.6.0 \
3628
--env=COMMODORE_API_URL="$LIEUTENANT_URL" \
3729
--env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
38-
--env=COMMODORE_GLOBAL_GIT_BASE="https://github.com/$GITHUB_USERNAME" \
3930
--env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \
4031
--env=CLUSTER_ID="$CLUSTER_ID" \
4132
--env=GITLAB_ENDPOINT="$GITLAB_ENDPOINT" \

‎3_steward_on_minikube.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
34
source lib/functions.sh
45
source lib/minikube.sh
56

67
check_minikube
78

89
echo "===> Find Cluster ID"
910
CLUSTER_ID=$(kubectl --context minikube -n lieutenant get cluster | grep Minikube | awk 'NR==1{print $1}')
10-
check_variable "CLUSTER_ID" $CLUSTER_ID
11+
check_variable "CLUSTER_ID" "$CLUSTER_ID"
1112

1213
echo "===> Find Lieutenant URL"
1314
LIEUTENANT_URL=$(curl http://localhost:4040/api/tunnels --silent | jq -r '.["tunnels"][0]["public_url"]')
14-
check_variable "LIEUTENANT_URL" $LIEUTENANT_URL
15+
check_variable "LIEUTENANT_URL" "$LIEUTENANT_URL"
1516

1617
echo "===> Find Lieutenant API token"
17-
LIEUTENANT_TOKEN=$(kubectl --context minikube -n lieutenant get secret $(kubectl --context minikube -n lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}') -o go-template='{{.data.token | base64decode}}')
18-
check_variable "LIEUTENANT_TOKEN" $LIEUTENANT_TOKEN
19-
LIEUTENANT_AUTH="Authorization: Bearer ${LIEUTENANT_TOKEN}"
18+
LIEUTENANT_TOKEN=$(kubectl --context minikube -n lieutenant get secret "$(kubectl --context minikube -n lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}')" -o go-template='{{.data.token | base64decode}}')
19+
check_variable "LIEUTENANT_TOKEN" "$LIEUTENANT_TOKEN"
20+
LIEUTENANT_AUTH="Authorization: Bearer $LIEUTENANT_TOKEN"
2021

2122
echo "===> Check the validity of the bootstrap token"
2223
wait_for_token "$CLUSTER_ID"

‎4_synthesize_on_k3s.sh‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
34
source lib/functions.sh
45
source lib/k3s.sh
56

6-
check_variable "GITLAB_TOKEN" $GITLAB_TOKEN
7-
check_variable "GITLAB_ENDPOINT" $GITLAB_ENDPOINT
8-
check_variable "GITLAB_USERNAME" $GITLAB_USERNAME
9-
check_variable "TENANT_ID" $TENANT_ID
10-
check_variable "LIEUTENANT_URL" $LIEUTENANT_URL
11-
check_variable "LIEUTENANT_TOKEN" $LIEUTENANT_TOKEN
12-
check_variable "COMMODORE_SSH_PRIVATE_KEY" $COMMODORE_SSH_PRIVATE_KEY
7+
check_variable "GITLAB_TOKEN" "$GITLAB_TOKEN"
8+
check_variable "GITLAB_ENDPOINT" "$GITLAB_ENDPOINT"
9+
check_variable "GITLAB_USERNAME" "$GITLAB_USERNAME"
10+
check_variable "COMMODORE_SSH_PRIVATE_KEY" "$COMMODORE_SSH_PRIVATE_KEY"
11+
12+
LIEUTENANT_URL=$(curl http://localhost:4040/api/tunnels --silent | jq -r '.["tunnels"][0]["public_url"]')
13+
check_variable "LIEUTENANT_URL" "$LIEUTENANT_URL"
14+
15+
TENANT_ID=$(kubectl --context minikube --namespace lieutenant get tenant | grep t- | awk 'NR==1{print $1}')
16+
check_variable "TENANT_ID" "$TENANT_ID"
17+
18+
LIEUTENANT_TOKEN=$(kubectl --context minikube --namespace lieutenant get secret "$(kubectl --context minikube --namespace lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}')" -o go-template='{{.data.token | base64decode}}')
19+
check_variable "LIEUTENANT_TOKEN" "$LIEUTENANT_TOKEN"
1320

1421
# Launch K3s
1522
k3d cluster create projectsyn
1623

1724
wait_for_k3s
1825
wait_for_traefik
1926

20-
LIEUTENANT_AUTH="Authorization: Bearer ${LIEUTENANT_TOKEN}"
27+
LIEUTENANT_AUTH="Authorization: Bearer $LIEUTENANT_TOKEN"
2128

2229
echo "===> Register this cluster via the API"
2330
CLUSTER_ID=$(curl -s -H "$LIEUTENANT_AUTH" -H "Content-Type: application/json" -X POST --data "{ \"tenant\": \"${TENANT_ID}\", \"displayName\": \"K3s cluster\", \"facts\": { \"cloud\": \"local\", \"distribution\": \"k3s\", \"region\": \"local\" }, \"gitRepo\": { \"url\": \"ssh://git@${GITLAB_ENDPOINT}/${GITLAB_USERNAME}/tutorial-cluster-k3s.git\" } }" "${LIEUTENANT_URL}/clusters" | jq -r ".id")
24-
check_variable "CLUSTER_ID" $CLUSTER_ID
31+
check_variable "CLUSTER_ID" "$CLUSTER_ID"
2532

2633
echo "===> Kickstart Commodore"
2734
echo "===> IMPORTANT: When prompted enter your SSH key password"
2835
kubectl --context minikube -n lieutenant run commodore-shell \
29-
--image=docker.io/projectsyn/commodore:v0.3.0 \
36+
--image=docker.io/projectsyn/commodore:v0.6.0 \
3037
--env=COMMODORE_API_URL="$LIEUTENANT_URL" \
3138
--env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
32-
--env=COMMODORE_GLOBAL_GIT_BASE="https://github.com/$GITHUB_USERNAME" \
3339
--env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \
3440
--env=CLUSTER_ID="$CLUSTER_ID" \
3541
--env=GITLAB_ENDPOINT="$GITLAB_ENDPOINT" \

‎4_synthesize_on_kind.sh‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
34
source lib/functions.sh
45

5-
check_variable "GITLAB_TOKEN" $GITLAB_TOKEN
6-
check_variable "GITLAB_ENDPOINT" $GITLAB_ENDPOINT
7-
check_variable "GITLAB_USERNAME" $GITLAB_USERNAME
8-
check_variable "TENANT_ID" $TENANT_ID
9-
check_variable "LIEUTENANT_URL" $LIEUTENANT_URL
10-
check_variable "LIEUTENANT_TOKEN" $LIEUTENANT_TOKEN
11-
check_variable "COMMODORE_SSH_PRIVATE_KEY" $COMMODORE_SSH_PRIVATE_KEY
6+
check_variable "GITLAB_TOKEN" "$GITLAB_TOKEN"
7+
check_variable "GITLAB_ENDPOINT" "$GITLAB_ENDPOINT"
8+
check_variable "GITLAB_USERNAME" "$GITLAB_USERNAME"
9+
check_variable "COMMODORE_SSH_PRIVATE_KEY" "$COMMODORE_SSH_PRIVATE_KEY"
10+
11+
LIEUTENANT_URL=$(curl http://localhost:4040/api/tunnels --silent | jq -r '.["tunnels"][0]["public_url"]')
12+
check_variable "LIEUTENANT_URL" "$LIEUTENANT_URL"
13+
14+
TENANT_ID=$(kubectl --context minikube --namespace lieutenant get tenant | grep t- | awk 'NR==1{print $1}')
15+
check_variable "TENANT_ID" "$TENANT_ID"
16+
17+
LIEUTENANT_TOKEN=$(kubectl --context minikube --namespace lieutenant get secret "$(kubectl --context minikube --namespace lieutenant get sa api-access-synkickstart -o go-template='{{(index .secrets 0).name}}')" -o go-template='{{.data.token | base64decode}}')
18+
check_variable "LIEUTENANT_TOKEN" "$LIEUTENANT_TOKEN"
1219

1320
# Launch kind
1421
kind create cluster --name projectsyn
@@ -17,15 +24,14 @@ LIEUTENANT_AUTH="Authorization: Bearer ${LIEUTENANT_TOKEN}"
1724

1825
echo "===> Register this cluster via the API"
1926
CLUSTER_ID=$(curl -s -H "$LIEUTENANT_AUTH" -H "Content-Type: application/json" -X POST --data "{ \"tenant\": \"${TENANT_ID}\", \"displayName\": \"Kind cluster\", \"facts\": { \"cloud\": \"local\", \"distribution\": \"k3s\", \"region\": \"local\" }, \"gitRepo\": { \"url\": \"ssh://git@${GITLAB_ENDPOINT}/${GITLAB_USERNAME}/tutorial-cluster-kind.git\" } }" "${LIEUTENANT_URL}/clusters" | jq -r ".id")
20-
check_variable "CLUSTER_ID" $CLUSTER_ID
27+
check_variable "CLUSTER_ID" "$CLUSTER_ID"
2128

2229
echo "===> Kickstart Commodore"
2330
echo "===> IMPORTANT: When prompted enter your SSH key password"
2431
kubectl --context minikube -n lieutenant run commodore-shell \
25-
--image=docker.io/projectsyn/commodore:v0.3.0 \
32+
--image=docker.io/projectsyn/commodore:v0.6.0 \
2633
--env=COMMODORE_API_URL="$LIEUTENANT_URL" \
2734
--env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
28-
--env=COMMODORE_GLOBAL_GIT_BASE="https://github.com/$GITHUB_USERNAME" \
2935
--env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \
3036
--env=CLUSTER_ID="$CLUSTER_ID" \
3137
--env=GITLAB_ENDPOINT="$GITLAB_ENDPOINT" \

‎4_synthesize_on_microk8s.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
34
source lib/functions.sh
45

5-
check_variable "GITLAB_TOKEN" $GITLAB_TOKEN
6-
check_variable "GITLAB_ENDPOINT" $GITLAB_ENDPOINT
7-
check_variable "GITLAB_USERNAME" $GITLAB_USERNAME
8-
check_variable "TENANT_ID" $TENANT_ID
9-
check_variable "LIEUTENANT_URL" $LIEUTENANT_URL
10-
check_variable "LIEUTENANT_TOKEN" $LIEUTENANT_TOKEN
11-
check_variable "COMMODORE_SSH_PRIVATE_KEY" $COMMODORE_SSH_PRIVATE_KEY
6+
check_variable "GITLAB_TOKEN" "$GITLAB_TOKEN"
7+
check_variable "GITLAB_ENDPOINT" "$GITLAB_ENDPOINT"
8+
check_variable "GITLAB_USERNAME" "$GITLAB_USERNAME"
9+
check_variable "TENANT_ID" "$TENANT_ID"
10+
check_variable "LIEUTENANT_URL" "$LIEUTENANT_URL"
11+
check_variable "LIEUTENANT_TOKEN" "$LIEUTENANT_TOKEN"
12+
check_variable "COMMODORE_SSH_PRIVATE_KEY" "$COMMODORE_SSH_PRIVATE_KEY"
1213

1314
# Launch microk8s
14-
microk8s start
15-
microk8s enable dns
16-
microk8s status --wait-ready
15+
sudo microk8s start
16+
sudo microk8s enable dns
17+
sudo microk8s status --wait-ready
1718

1819
LIEUTENANT_AUTH="Authorization: Bearer ${LIEUTENANT_TOKEN}"
1920

2021
echo "===> Register this cluster via the API"
2122
CLUSTER_ID=$(curl -s -H "$LIEUTENANT_AUTH" -H "Content-Type: application/json" -X POST --data "{ \"tenant\": \"${TENANT_ID}\", \"displayName\": \"Microk8s cluster\", \"facts\": { \"cloud\": \"local\", \"distribution\": \"k3s\", \"region\": \"local\" }, \"gitRepo\": { \"url\": \"ssh://git@${GITLAB_ENDPOINT}/${GITLAB_USERNAME}/tutorial-cluster-microk8s.git\" } }" "${LIEUTENANT_URL}/clusters" | jq -r ".id")
22-
check_variable "CLUSTER_ID" $CLUSTER_ID
23+
check_variable "CLUSTER_ID" "$CLUSTER_ID"
2324

2425
echo "===> Kickstart Commodore"
2526
echo "===> IMPORTANT: When prompted enter your SSH key password"
2627
kubectl --context minikube -n lieutenant run commodore-shell \
27-
--image=docker.io/projectsyn/commodore:v0.3.0 \
28+
--image=docker.io/projectsyn/commodore:v0.6.0 \
2829
--env=COMMODORE_API_URL="$LIEUTENANT_URL" \
2930
--env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
30-
--env=COMMODORE_GLOBAL_GIT_BASE="https://github.com/$GITHUB_USERNAME" \
3131
--env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \
3232
--env=CLUSTER_ID="$CLUSTER_ID" \
3333
--env=GITLAB_ENDPOINT="$GITLAB_ENDPOINT" \

‎5_delete.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
34
source lib/functions.sh
45
source lib/minikube.sh
56

67
echo "===> Find Tenant ID"
78
TENANT_ID=$(kubectl --context minikube -n lieutenant get tenant | grep t- | awk 'NR==1{print $1}')
8-
check_variable "TENANT_ID" $TENANT_ID
9+
check_variable "TENANT_ID" "$TENANT_ID"
910

1011
echo "===> Removing all clusters"
1112
CLUSTERS=($(kubectl --context minikube -n lieutenant get cluster -o jsonpath="{$.items[*].metadata.name}"))
@@ -21,5 +22,7 @@ sleep 20s
2122

2223
minikube delete
2324
k3d cluster delete projectsyn
24-
kind delete cluster --name projectsyn
25+
# kind delete cluster --name projectsyn
26+
# sudo microk8s reset
27+
# sudo microk8s stop
2528
killall ngrok

‎Makefile‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
SHELL := /bin/bash # for 'source'
2-
31
out_dir := ./build
42
docker_cmd ?= docker
53
docker_opts ?= --rm --tty --user "$$(id -u)"
6-
asciidoctor_pdf_cmd ?= $(docker_cmd) run $(docker_opts) --volume "$${PWD}":/documents/ vshn/asciidoctor-pdf:1.4
4+
asciidoctor_pdf_cmd ?= $(docker_cmd) run $(docker_opts) --volume "$${PWD}":/documents/ vshn/asciidoctor-pdf:1.6.0
75
asciidoctor_opts ?= --destination-dir=$(out_dir)
86

97
.PHONY: all
@@ -12,7 +10,7 @@ all: pdf
1210
.PHONY: pdf
1311
pdf: build/tutorial.pdf
1412

15-
build/tutorial.pdf: tutorial.adoc
13+
build/tutorial.pdf: docs/tutorial.adoc
1614
$(asciidoctor_pdf_cmd) $(asciidoctor_opts) $<
1715

1816
.PHONY: clean
@@ -25,5 +23,4 @@ setup:
2523
./1_lieutenant_on_minikube.sh; \
2624
./2_commodore_on_minikube.sh; \
2725
./3_steward_on_minikube.sh; \
28-
source ./env.sh; \
2926
./4_synthesize_on_k3s.sh

0 commit comments

Comments
 (0)