Merge pull request #1 from hudomju/ahybrid-upgrade-asm-13

Ahybrid upgrade asm 13

Author: hudomju

courses/ahybrid/v1.0/AHYBRID051/scripts/env.sh

@@ -26,7 +26,9 @@ export C1_NODES=2
 export C1_SCOPE="https://www.googleapis.com/auth/devstorage.read_only","https://www.googleapis.com/auth/logging.write","https://www.googleapis.com/auth/monitoring","https://www.googleapis.com/auth/servicecontrol","https://www.googleapis.com/auth/service.management.readonly","https://www.googleapis.com/auth/trace.append"
 export PROJECT_NUMBER=$(gcloud projects describe ${PROJECT_ID} \
     --format="value(projectNumber)")
+export FLEET_PROJECT_ID=${FLEET_PROJECT_ID:-$PROJECT_ID}
 export WORKLOAD_POOL=${PROJECT_ID}.svc.id.goog
 export MESH_ID="proj-${PROJECT_NUMBER}"
+export DIR_PATH=.
 
 gcloud config set compute/zone $C1_ZONE

courses/ahybrid/v1.0/AHYBRID051/scripts/tracing.yaml

@@ -1,14 +1,15 @@
-# curl https://storage.googleapis.com/csm-artifacts/asm/install_asm_1.9 > install_asm
+# curl https://storage.googleapis.com/csm-artifacts/asm/asmcli_1.13 > asmcli
 
-chmod +x ../common/scripts/install_asm
+chmod +x ../common/scripts/asmcli
 
-../common/scripts/install_asm \
+../common/scripts/asmcli \
 --project_id $PROJECT_ID \
 --cluster_name $C1_NAME \
 --cluster_location $C1_ZONE \
---mode install \
---enable_gcp_apis \
+--fleet_id $PROJECT_ID \
+--output_dir . \
 --enable_all \
+--ca mesh_ca \
 --custom_overlay $LAB_DIR/training-data-analyst/courses/ahybrid/v1.0/common/scripts/tracing.yaml
 
 kubectl label namespace default \