Import all changes from RIV

Author: ROunofF

docs/style_guide.md

@@ -64,6 +64,14 @@ sidebar_custom_props:
 ---
 ```
 
+To mark your module as optional:
+```
+---
+...
+sidebar_custom_props:  { "optional": "true" }
+---
+```
+
 ### Navigating the AWS console
 
 There are instances where the user needs to navigate to specific screens in the AWS console. It is preferable to provide a link to the exact screen if possible, or a close as can be done.

hack/create-infrastructure.sh

@@ -20,5 +20,18 @@ if [ $cluster_exists -eq 0 ]; then
   echo "Cluster ${EKS_CLUSTER_NAME} already exists"
 else
   echo "Creating cluster ${EKS_CLUSTER_NAME}"
-  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster.yaml | envsubst | eksctl create cluster -f -'
-fi
+  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster.yaml | envsubst | eksctl create cluster -f -'&
+fi
+
+auto_cluster_exists=0
+aws eks describe-cluster --name "${EKS_CLUSTER_AUTO_NAME}" &> /dev/null || auto_cluster_exists=$?
+
+if [ $auto_cluster_exists -eq 0 ]; then
+  echo "Auto mode cluster ${EKS_CLUSTER_AUTO_NAME} already exists"
+else
+  echo "Creating auto mode cluster ${EKS_CLUSTER_AUTO_NAME} with terraform"
+  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster-auto.yaml | envsubst'
+  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster-auto.yaml | envsubst | eksctl create cluster -f -'&
+fi
+
+wait

hack/destroy-infrastructure.sh

@@ -15,10 +15,23 @@ aws eks describe-cluster --name "${EKS_CLUSTER_NAME}" &> /dev/null || cluster_ex
 if [ $cluster_exists -eq 0 ]; then
   echo "Deleting cluster ${EKS_CLUSTER_NAME}"
   bash $SCRIPT_DIR/shell.sh "${environment}" 'delete-environment' || true
-
-  bash $SCRIPT_DIR/exec.sh "${environment}" 'eksctl delete cluster --name ${EKS_CLUSTER_NAME} --region ${AWS_REGION} --wait --force --disable-nodegroup-eviction --timeout 45m'
+  bash $SCRIPT_DIR/exec.sh "${environment}" 'eksctl delete cluster --name ${EKS_CLUSTER_NAME} --region ${AWS_REGION} --wait --force --disable-nodegroup-eviction --timeout 45m'&
 else
   echo "Cluster ${EKS_CLUSTER_NAME} does not exist"
 fi
 
+export EKS_CLUSTER_AUTO_NAME="${EKS_CLUSTER_NAME}-auto"
+auto_cluster_exists=0
+aws eks describe-cluster --name "${EKS_CLUSTER_AUTO_NAME}" &> /dev/null || auto_cluster_exists=$?
+
+if [ $auto_cluster_exists -eq 0 ]; then
+  echo "Deleting auto mode cluster ${EKS_CLUSTER_AUTO_NAME}"
+  bash $SCRIPT_DIR/shell.sh "${environment}" 'delete-environment' || true # Needed ?
+  bash $SCRIPT_DIR/exec.sh "${environment}" 'eksctl delete cluster --name ${EKS_CLUSTER_AUTO_NAME} --region ${AWS_REGION} --wait --force --disable-nodegroup-eviction --timeout 45m'
+else
+  echo "Auto mode cluster ${EKS_CLUSTER_AUTO_NAME} does not exist"
+fi
+
+wait
+
 aws cloudformation delete-stack --stack-name ${EKS_CLUSTER_NAME}-ide-role || true

hack/exec.sh

@@ -31,5 +31,5 @@ $CONTAINER_CLI run --rm \
   -v $SCRIPT_DIR/../manifests:/manifests \
   -v $SCRIPT_DIR/../cluster:/cluster \
   --entrypoint /bin/bash \
-  -e 'EKS_CLUSTER_NAME' -e 'AWS_REGION' -e 'AWS_CONTAINER_CREDENTIALS_RELATIVE_URI' \
+  -e 'EKS_CLUSTER_NAME' -e 'EKS_CLUSTER_AUTO_NAME'  -e 'AWS_REGION' -e 'AWS_CONTAINER_CREDENTIALS_RELATIVE_URI' -e RESOURCE_CODEBUILD_ROLE_ARN \
   $aws_credential_args $container_image -c "$shell_command"

hack/lib/common-env.sh

@@ -2,8 +2,10 @@ environment=${environment:-""}
 
 if [ -z "$environment" ]; then
   export EKS_CLUSTER_NAME="eks-workshop"
+  export EKS_CLUSTER_AUTO_NAME="eks-workshop-auto"
 else
   export EKS_CLUSTER_NAME="eks-workshop-${environment}"
+  export EKS_CLUSTER_AUTO_NAME="eks-workshop-auto-${environment}"
 fi
 
 AWS_REGION=${AWS_REGION:-""}

hack/pre-provision-resources.sh

@@ -9,6 +9,8 @@ fi
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
+echo $SCRIPT_DIR
+
 source $SCRIPT_DIR/lib/common-env.sh
 
 terraform_dir="${SCRIPT_DIR}/../terraform-resources"
@@ -23,7 +25,7 @@ rm -rf $conf_dir
 mkdir -p "$conf_dir"
 
 cat << EOF > $conf_dir/backend_override.tf
-terraform { 
+terraform {
   backend "local" {
     path = "../terraform.tfstate"
   }
@@ -34,12 +36,19 @@ cp $manifests_dir/.workshop/terraform/base.tf $conf_dir/base.tf
 
 find $manifests_dir/modules -type d -name "preprovision" -print0 | while read -d $'\0' file
 do
-  target=$(echo $file | md5sum | cut -f1 -d" ")
+  md5=$(echo ${file#"$manifests_dir/modules/"} | md5sum | cut -f1 -d" " | cut -d'/' -f1 | rev) # In case of non-unique
+  first_path=$(echo ${file#"$manifests_dir/modules/"} | cut -d'/' -f1,2 | tr '/' '_')
+  target="${first_path}-$md5"
+
   cp -R $file $conf_dir/$target
 
   cat << EOF > $conf_dir/$target.tf
 module "gen-$target" {
   source = "./$target"
+  providers = {
+    helm.auto_mode = helm.auto_mode
+    kubernetes.auto_mode = kubernetes.auto_mode
+  }
 
   eks_cluster_id = local.eks_cluster_id
   tags           = local.tags

hack/run-tests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 environment=$1
 module=$2

hack/shell.sh

@@ -40,6 +40,6 @@ fi
 $CONTAINER_CLI run --rm $interactive_args $dns_args \
   -v $SCRIPT_DIR/../manifests:/eks-workshop/manifests \
   -v $SCRIPT_DIR/../cluster:/cluster \
-  -e 'EKS_CLUSTER_NAME' -e 'AWS_REGION' \
+  -e 'EKS_CLUSTER_NAME' -e 'EKS_CLUSTER_AUTO_NAME' -e 'AWS_REGION' \
   -p 8889:8889 \
   $aws_credential_args $container_image $shell_command

lab/bin/reset-environment

@@ -92,6 +92,11 @@ if [ ! -z "$module" ]; then
   if [ $module = "introduction/getting-started" ]; then
     exit
   fi
+
+  if [[ "$module" = "fastpaths/"* ]]; then
+    kubectl config use-context eks-workshop-auto
+    exit
+  fi
 fi
 
 logmessage "🎓 ${PURPLE}Tip:${NC} Read the rest of the lab introduction while you wait!\n"
@@ -106,24 +111,29 @@ kubectl delete pod load-generator --ignore-not-found
 
 kubectl delete namespace other --ignore-not-found
 
-kubectl apply -k $base_path --prune --all \
-  --prune-allowlist=autoscaling/v1/HorizontalPodAutoscaler \
-  --prune-allowlist=core/v1/Service \
-  --prune-allowlist=core/v1/ConfigMap \
-  --prune-allowlist=apps/v1/Deployment \
-  --prune-allowlist=apps/v1/StatefulSet \
-  --prune-allowlist=core/v1/ServiceAccount \
-  --prune-allowlist=core/v1/Secret \
-  --prune-allowlist=core/v1/PersistentVolumeClaim \
-  --prune-allowlist=scheduling.k8s.io/v1/PriorityClass \
-  --prune-allowlist=networking.k8s.io/v1/Ingress
+if [[ $module != introduction/basics* ]]; then    
+    kubectl apply -k $base_path --prune --all \
+      --prune-allowlist=autoscaling/v1/HorizontalPodAutoscaler \
+      --prune-allowlist=core/v1/Service \
+      --prune-allowlist=core/v1/ConfigMap \
+      --prune-allowlist=apps/v1/Deployment \
+      --prune-allowlist=apps/v1/StatefulSet \
+      --prune-allowlist=core/v1/ServiceAccount \
+      --prune-allowlist=core/v1/Secret \
+      --prune-allowlist=core/v1/PersistentVolumeClaim \
+      --prune-allowlist=scheduling.k8s.io/v1/PriorityClass \
+      --prune-allowlist=networking.k8s.io/v1/Ingress
 
-logmessage "\n⏳ Waiting for application to become ready..."
+    logmessage "\n⏳ Waiting for application to become ready..."
 
-sleep 10
+    sleep 10
 
-kubectl wait --for=condition=available --timeout=240s deployments -l app.kubernetes.io/created-by=eks-workshop -A
-kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
+    kubectl wait --for=condition=available --timeout=240s deployments -l app.kubernetes.io/created-by=eks-workshop -A
+    kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
+
+else
+    kubectl delete -k $base_path --ignore-not-found
+fi
 
 # Addons
 rm -rf /eks-workshop/terraform
@@ -238,10 +248,12 @@ if [ $EXIT_CODE -ne 0 ]; then
 fi
 
 # Recycle workload pods in case stateful pods got restarted
-kubectl delete pod -l app.kubernetes.io/created-by=eks-workshop -l app.kubernetes.io/component=service -A
+kubectl delete pod -l app.kubernetes.io/created-by=eks-workshop -l app.kubernetes.io/component=service -A --ignore-not-found
 
 # Wait for the workload pods previously recycled
-kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
+if kubectl get pods -A -l app.kubernetes.io/created-by=eks-workshop 2>/dev/null | grep -q .; then
+  kubectl wait --for=condition=Ready --timeout=240s pods -l app.kubernetes.io/created-by=eks-workshop -A
+fi
 
 # Finished
 logmessage "\n✅ Environment is ${GREEN}ready${NC}!"

lab/scripts/setup.sh

@@ -21,6 +21,7 @@ export AWS_PAGER=""
 export AWS_REGION="${AWS_REGION}"
 export AWS_ACCOUNT_ID="${AWS_ACCOUNT_ID}"
 export EKS_CLUSTER_NAME="${EKS_CLUSTER_NAME}"
+export EKS_CLUSTER_AUTO_NAME="${EKS_CLUSTER_AUTO_NAME}"
 export EKS_DEFAULT_MNG_NAME="default"
 export EKS_DEFAULT_MNG_MIN=3
 export EKS_DEFAULT_MNG_MAX=6
@@ -30,15 +31,18 @@ EOT
 touch ~/.bashrc.d/workshop-env.bash
 
 cat << EOT > /home/ec2-user/.bashrc.d/aliases.bash
-function prepare-environment() { 
+function prepare-environment() {
+  start_time=\$(date +%s)
   bash /usr/local/bin/reset-environment \$1
   exit_code=\$?
   source ~/.bashrc.d/workshop-env.bash
+  echo "Execution time: \$((\$(date +%s) - start_time)) seconds"
   return \$exit_code
 }
 
 function use-cluster() { bash /usr/local/bin/use-cluster \$1; source ~/.bashrc.d/env.bash; }
 function create-cluster() { URL=https://raw.githubusercontent.com/${REPOSITORY_OWNER}/${REPOSITORY_NAME}/refs/heads/${REPOSITORY_REF}/cluster/eksctl/cluster.yaml; echo "Creating cluster with eksctl from $URL"; curl -fsSL $URL | envsubst | eksctl create cluster -f -; }
+function create-cluster-auto() { URL=https://raw.githubusercontent.com/${REPOSITORY_OWNER}/${REPOSITORY_NAME}/refs/heads/${REPOSITORY_REF}/cluster/eksctl/cluster-auto.yaml; echo "Creating cluster with eksctl from $URL"; curl -fsSL $URL | envsubst | eksctl create cluster -f -; }
 EOT
 
 REPOSITORY_OWNER=${REPOSITORY_OWNER:-"aws-samples"}
@@ -60,4 +64,4 @@ echo "export ANALYTICS_ENDPOINT='${ANALYTICS_ENDPOINT}'" > ~/.bashrc.d/analytics
 
 /usr/local/bin/kubectl completion bash >  ~/.bashrc.d/kubectl_completion.bash
 echo "alias k=kubectl" >> ~/.bashrc.d/kubectl_completion.bash
-echo "complete -F __start_kubectl k" >> ~/.bashrc.d/kubectl_completion.bash
+echo "complete -F __start_kubectl k" >> ~/.bashrc.d/kubectl_completion.bash