aws-samples · ROunofF · Nov 18, 2023 · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023
diff --git a/.spelling b/.spelling
@@ -1,145 +1,146 @@
 # global dictionary is at the start, file overrides afterwards
 # one word per line, to define a file override use ' - filename'
 # where filename is relative to this configuration file
-
-EKS
-Kubernetes
-AWS
+ack
+adot
+AIML
+apis
+architecting
+argocd
+ASCP
 ASG
-EC2
-VPC
-CNI
+autoscaled
 autoscaler
 autoscalers
 autoscaling
-autoscaled
-Karpenter
-spec
-configmaps
-specs
-ack
-configmap
-dynamodb
-kustomize
-nlb
-img
-src
-home.png
-kubectl
-yaml
-sqs
-mq
-iam
-irsa
-cloudformation
-kustomization
-kustomizations
+AWS
 aws_region
-crossplane
-s3
-xrd
-xr
-customresourcedefinition
-crd
-openapi
-sre
-xrs
-upbound
-ui
-pre-installed
-namespace
-json
-rds
-stateful
-sdk
+bitnami
+burstable
 cli
+cloud9
+cloudformation
 cncf
-apis
-versioned
+CNI
+cni-tshoot
+codebuild
+codecommit
+codepipeline
+configmap
+configmaps
+containerd
+controlplanes
+cpu
+cpus
+crd
 crds
-argocd
+crossplane
+customresourcedefinition
+daemonset
+daemonsets
+datasource
+DCGM
 dev
-webhooks
-gitops
-jsonnet
-codecommit
-cloud9
 devops
+distro
+dynamodb
+EC2
+ecommerce
 ecr
-codebuild
-codepipeline
-imagerepository
-imagepolicy
-imageupdateautomation
-pre-bootstrap
-lifecycle
-elasticache
-kubecost
+EKS
 eksctl
-OIDC
-ONTAP
-tolerations
+elasticache
 fargate
-adot
-distro
-kubelet
-inferentia
-trainium
-ASCP
-kubeseal
-passcode
-statefulset
-replicaset
-replicasets
-daemonset
-daemonsets
-rolebinding
-rolebindings
-serviceaccount
-serviceaccounts
-fluentd
 fluentbit
-datasource
+fluentd
+Gitea
+gitops
 healthcheck
 healthchecks
-jmes
-opentelemetry
-jdbc
+home.png
+hostnames
+iam
+imagepolicy
+imagerepository
+imageupdateautomation
+img
+inferentia
 ipamd
-nodegroup
-controlplanes
-ecommerce
-webserver
-burstable
-opensearch
-opentelemetrycollector
-schedulable
-architecting
-bitnami
-prepper
-cpu
-cpus
-kyverno
-weaveworks
-nirmal
-mehta
-sheetal
+IPVS
+irsa
+jdbc
+jmes
 joshi
+json
+jsonnet
+Karpenter
 keda
-AIML
-DCGM
+kubecost
+kubectl
+kubelet
+Kubernetes
+kubeseal
+kustomization
+kustomizations
+kustomize
+kyverno
+lifecycle
+loadbalancer
+mehta
 Mountpoint
-IPVS
-xvda
+mq
 NACL
-routability
-xnew
-loadbalancer
+namespace
+nirmal
+nlb
 nodeadm
-containerd
 nodeconfig
-cni-tshoot
+nodegroup
+OIDC
+ONTAP
+openapi
+opensearch
+opentelemetry
+opentelemetrycollector
+passcode
+pre-bootstrap
+pre-installed
+precreated
+prepper
+rds
+replicaset
+replicasets
 resolv
+rolebinding
+rolebindings
+routability
+s3
+schedulable
+sdk
+serviceaccount
+serviceaccounts
+sheetal
+spec
+specs
+sqs
+src
+sre
+stateful
+statefulset
+tolerations
+trainium
+ui
 untolerated
+upbound
+versioned
+VPC
+weaveworks
+webhooks
+webserver
 Workernodes
-Gitea
+xnew
+xr
+xrd
+xrs
+xvda
+yaml
diff --git a/.yarn/releases/yarn-4.10.3.cjs b/.yarn/releases/yarn-4.10.3.cjs
diff --git a/cluster/eksctl/cluster-auto.yaml b/cluster/eksctl/cluster-auto.yaml
@@ -0,0 +1,32 @@
+apiVersion: eksctl.io/v1alpha5
+kind: ClusterConfig
+availabilityZones:
+  - ${AWS_REGION}a
+  - ${AWS_REGION}b
+  - ${AWS_REGION}c
+metadata:
+  name: ${EKS_CLUSTER_AUTO_NAME}
+  region: ${AWS_REGION}
+  version: "1.33"
+  tags:
+    karpenter.sh/discovery: ${EKS_CLUSTER_AUTO_NAME}
+    created-by: eks-workshop-v2
+    env: ${EKS_CLUSTER_AUTO_NAME}
+vpc:
+  cidr: 10.43.0.0/16
+  clusterEndpoints:
+    privateAccess: true
+    publicAccess: true
+autoModeConfig:
+  enabled: true
+  nodePools: [general-purpose, system]
+accessConfig:
+  authenticationMode: API
+  bootstrapClusterCreatorAdminPermissions: true
+  accessEntries:
+   - principalARN: ${RESOURCE_CODEBUILD_ROLE_ARN}
+     accessPolicies:
+       - policyARN: "arn:aws:eks::aws:cluster-access-policy/AmazonEKSClusterAdminPolicy"
+         accessScope:
+          type: cluster
+
diff --git a/docs/style_guide.md b/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.

diff --git a/hack/create-infrastructure.sh b/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
diff --git a/hack/destroy-infrastructure.sh b/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
 
-aws cloudformation delete-stack --stack-name ${EKS_CLUSTER_NAME}-ide-role || true
+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
+
+aws cloudformation delete-stack --stack-name ${EKS_CLUSTER_NAME}-ide-role || true
+
+wait
diff --git a/hack/exec.sh b/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"
diff --git a/hack/lib/common-env.sh b/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:-""}