Merge pull request #7 from projectsyn/version-updates

Updated components to latest versions

Author: akosma

1_lieutenant_on_minikube.sh

@@ -16,10 +16,10 @@ echo "===> Creating namespace"
 kubectl create namespace lieutenant
 
 echo "===> CRDs (global scope)"
-kubectl apply -k github.com/projectsyn/lieutenant-operator/deploy/crds?ref=v0.5.2
+kubectl apply -k "github.com/projectsyn/lieutenant-operator/config/crd?ref=v1.3.0"
 
 echo "===> Operator deployment"
-kubectl -n lieutenant apply -k github.com/projectsyn/lieutenant-operator/deploy?ref=v0.5.2
+kubectl -n lieutenant apply -k "github.com/projectsyn/lieutenant-operator/config/samples/deployment?ref=v1.3.0"
 
 echo "===> Operator configuration"
 kubectl -n lieutenant set env deployment/lieutenant-operator -c lieutenant-operator \
@@ -30,7 +30,7 @@ kubectl -n lieutenant set env deployment/lieutenant-operator -c lieutenant-opera
 
 # tag::demo[]
 echo "===> API deployment"
-kubectl -n lieutenant apply -k "github.com/projectsyn/lieutenant-api/deploy?ref=v0.5.0"
+kubectl -n lieutenant apply -k "github.com/projectsyn/lieutenant-api/deploy?ref=v0.9.1"
 
 echo "===> API configuration"
 kubectl -n lieutenant set env deployment/lieutenant-api -c lieutenant-api \
@@ -65,7 +65,7 @@ LIEUTENANT_TOKEN=$(kubectl -n lieutenant get secret "$(kubectl -n lieutenant get
 LIEUTENANT_AUTH="Authorization: Bearer ${LIEUTENANT_TOKEN}"
 
 echo "===> Create a Lieutenant Tenant via the API"
-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")
+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\":\"v1\"}" "${LIEUTENANT_URL}/tenants" | jq -r ".id")
 echo "Tenant ID: $TENANT_ID"
 
 echo "===> Patch the Tenant object to add a cluster template"

2_commodore_on_minikube.sh

@@ -24,7 +24,7 @@ LIEUTENANT_TOKEN=$(kubectl --context minikube -n lieutenant get secret "$(kubect
 echo "===> Kickstart Commodore"
 echo "===> IMPORTANT: When prompted enter your SSH key password"
 kubectl -n lieutenant run commodore-shell \
-  --image=docker.io/projectsyn/commodore:v0.6.0 \
+  --image=docker.io/projectsyn/commodore:v1.3.2 \
   --env=COMMODORE_API_URL="$LIEUTENANT_URL" \
   --env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
   --env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \

4_synthesize_on_k3s.sh

@@ -33,7 +33,7 @@ check_variable "CLUSTER_ID" "$CLUSTER_ID"
 echo "===> Kickstart Commodore"
 echo "===> IMPORTANT: When prompted enter your SSH key password"
 kubectl --context minikube -n lieutenant run commodore-shell \
-  --image=docker.io/projectsyn/commodore:v0.6.0 \
+  --image=docker.io/projectsyn/commodore:v1.3.2 \
   --env=COMMODORE_API_URL="$LIEUTENANT_URL" \
   --env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
   --env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \

4_synthesize_on_kind.sh

@@ -29,7 +29,7 @@ check_variable "CLUSTER_ID" "$CLUSTER_ID"
 echo "===> Kickstart Commodore"
 echo "===> IMPORTANT: When prompted enter your SSH key password"
 kubectl --context minikube -n lieutenant run commodore-shell \
-  --image=docker.io/projectsyn/commodore:v0.6.0 \
+  --image=docker.io/projectsyn/commodore:v1.3.2 \
   --env=COMMODORE_API_URL="$LIEUTENANT_URL" \
   --env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
   --env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \

4_synthesize_on_microk8s.sh

@@ -6,10 +6,16 @@ source lib/functions.sh
 check_variable "GITLAB_TOKEN" "$GITLAB_TOKEN"
 check_variable "GITLAB_ENDPOINT" "$GITLAB_ENDPOINT"
 check_variable "GITLAB_USERNAME" "$GITLAB_USERNAME"
-check_variable "TENANT_ID" "$TENANT_ID"
+check_variable "COMMODORE_SSH_PRIVATE_KEY" "$COMMODORE_SSH_PRIVATE_KEY"
+
+LIEUTENANT_URL=$(curl http://localhost:4040/api/tunnels --silent | jq -r '.["tunnels"][0]["public_url"]')
 check_variable "LIEUTENANT_URL" "$LIEUTENANT_URL"
+
+TENANT_ID=$(kubectl --context minikube --namespace lieutenant get tenant | grep t- | awk 'NR==1{print $1}')
+check_variable "TENANT_ID" "$TENANT_ID"
+
+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}}')
 check_variable "LIEUTENANT_TOKEN" "$LIEUTENANT_TOKEN"
-check_variable "COMMODORE_SSH_PRIVATE_KEY" "$COMMODORE_SSH_PRIVATE_KEY"
 
 # Launch microk8s
 sudo microk8s start
@@ -25,7 +31,7 @@ check_variable "CLUSTER_ID" "$CLUSTER_ID"
 echo "===> Kickstart Commodore"
 echo "===> IMPORTANT: When prompted enter your SSH key password"
 kubectl --context minikube -n lieutenant run commodore-shell \
-  --image=docker.io/projectsyn/commodore:v0.6.0 \
+  --image=docker.io/projectsyn/commodore:v1.3.2 \
   --env=COMMODORE_API_URL="$LIEUTENANT_URL" \
   --env=COMMODORE_API_TOKEN="$LIEUTENANT_TOKEN" \
   --env=SSH_PRIVATE_KEY="$(cat ${COMMODORE_SSH_PRIVATE_KEY})" \

commodore_command.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-COMMODORE_VERSION="v0.6.0"
+COMMODORE_VERSION="v1.3.2"
 
 commodore() {
   LIEUTENANT_URL=$(curl http://localhost:4040/api/tunnels --silent | jq -r '.["tunnels"][0]["public_url"]')

docs/modules/ROOT/pages/index.adoc

@@ -12,9 +12,9 @@ There are many https://github.com/topics/commodore-component[Commodore Component
 
 This tutorial has been prepared with the following versions of Syn components in mind:
 
-* Commodore: 0.6.0
-* Lieutenant API: 0.5.0
-* Lieutenant Operator: 0.5.2
+* Commodore: 1.3.2
+* Lieutenant API: 0.9.1
+* Lieutenant Operator: 1.3.0
 
 Project Syn is moving fast, and we will update this tutorial accordingly as new features and capabilities are made available by the development team.