[FIX] Update ADOT version, fix VPC Lattice module cleanup, karpenter …

…test (#820) * Update ADOT to support 1.29 * Hook should be on the rollout to sucesfully wait * Delete item before CRD * Update addons in containers insights
aws-samples · Feb 15, 2024 · 953eba1 · 953eba1
1 parent de3db1f
commit 953eba1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/manifests/modules/networking/vpc-lattice/.workshop/cleanup.sh b/manifests/modules/networking/vpc-lattice/.workshop/cleanup.sh
@@ -6,12 +6,12 @@ logmessage "Deleting VPC Lattice routes and gateway..."
 
 kubectl delete namespace checkoutv2 --ignore-not-found
 
-delete-all-if-crd-exists targetgrouppolicies.application-networking.k8s.aws
-
 kubectl delete -f ~/environment/eks-workshop/modules/networking/vpc-lattice/routes --ignore-not-found
 cat ~/environment/eks-workshop/modules/networking/vpc-lattice/controller/eks-workshop-gw.yaml | envsubst | kubectl delete --ignore-not-found -f -
 kubectl delete -f ~/environment/eks-workshop/modules/networking/vpc-lattice/controller/gatewayclass.yaml --ignore-not-found
 
+delete-all-if-crd-exists targetgrouppolicies.application-networking.k8s.aws
+
 logmessage "Waiting for VPC Lattice target groups to be deleted..."
 
 timeout -s TERM 300 bash -c \

diff --git a/manifests/modules/observability/container-insights/.workshop/terraform/addon.tf b/manifests/modules/observability/container-insights/.workshop/terraform/addon.tf
@@ -3,7 +3,7 @@ module "adot-operator" {
 
   addon_config = {
     kubernetes_version = local.eks_cluster_version
-    addon_version      = "v0.78.0-eksbuild.2"
+    addon_version      = "v0.92.1-eksbuild.1"
     most_recent        = false
 
     preserve           = false

diff --git a/manifests/modules/observability/oss-metrics/.workshop/terraform/addon.tf b/manifests/modules/observability/oss-metrics/.workshop/terraform/addon.tf
@@ -44,7 +44,7 @@ module "adot-operator" {
 
   addon_config = {
     kubernetes_version = local.eks_cluster_version
-    addon_version      = "v0.78.0-eksbuild.2"
+    addon_version      = "v0.92.1-eksbuild.1"
     most_recent        = false
 
     preserve           = false

diff --git a/website/docs/autoscaling/compute/karpenter/node-provisioning.md b/website/docs/autoscaling/compute/karpenter/node-provisioning.md
@@ -48,13 +48,13 @@ Before we proceed, what instance from the table above do you think Karpenter wil
 
 Scale the deployment:
 
-```bash hook=karpenter-deployment
+```bash
 $ kubectl scale -n other deployment/inflate --replicas 5
 ```
 
 Because this operation is creating one or more new EC2 instances it will take a while, you can use `kubectl` to wait until its done with this command:
 
-```bash
+```bash hook=karpenter-deployment
 $ kubectl rollout status -n other deployment/inflate --timeout=180s
 ```