From e8aacee6d9efada6d25d0f1525d2088b15f1676e Mon Sep 17 00:00:00 2001
From: Sai Vennam <svennam92@gmail.com>
Date: Thu, 16 Nov 2023 20:25:06 -0600
Subject: [PATCH] Fix Karpenter tests

---
 .../karpenter/.workshop/terraform/addon.tf      | 17 +++++++++++++++--
 .../compute/karpenter/nodepool/nodepool.yaml    |  2 +-
 .../autoscaling/compute/karpenter/configure.md  |  2 +-
 .../docs/autoscaling/compute/karpenter/index.md |  2 +-
 .../tests/hook-karpenter-deployment.sh          |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/addon.tf b/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/addon.tf
index 4189e13f6..040dac49c 100644
--- a/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/addon.tf
+++ b/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/addon.tf
@@ -1,3 +1,12 @@
+provider "aws" {
+  region = "us-east-1"
+  alias  = "virginia"
+}
+
+data "aws_ecrpublic_authorization_token" "token" {
+  provider = aws.virginia
+}
+
 module "eks_blueprints_addons" {
   source = "aws-ia/eks-blueprints-addons/aws"
   version = "1.12.0"
@@ -6,6 +15,10 @@ module "eks_blueprints_addons" {
 
   karpenter_enable_spot_termination          = true
   karpenter_enable_instance_profile_creation = true
+  karpenter = {
+    repository_username = data.aws_ecrpublic_authorization_token.token.user_name
+    repository_password = data.aws_ecrpublic_authorization_token.token.password
+  }
 
   cluster_name      = local.eks_cluster_id
   cluster_endpoint  = local.eks_cluster_endpoint
@@ -15,7 +28,7 @@ module "eks_blueprints_addons" {
 
 output "environment" {
   value = <<EOF
-export KARPENTER_NODE_ROLE="${module.eks_blueprints_addons.karpenter.node_iam_role_name}"
-export KARPENTER_NODE_ROLE_ARN="${module.eks_blueprints_addons.karpenter.node_iam_role_arn}"
+export KARPENTER_ROLE="${module.eks_blueprints_addons.karpenter.node_iam_role_name}"
+export KARPENTER_ARN="${module.eks_blueprints_addons.karpenter.node_iam_role_arn}"
 EOF
 }
diff --git a/manifests/modules/autoscaling/compute/karpenter/nodepool/nodepool.yaml b/manifests/modules/autoscaling/compute/karpenter/nodepool/nodepool.yaml
index 7e75d8d14..ee0efe99f 100644
--- a/manifests/modules/autoscaling/compute/karpenter/nodepool/nodepool.yaml
+++ b/manifests/modules/autoscaling/compute/karpenter/nodepool/nodepool.yaml
@@ -32,7 +32,7 @@ metadata:
   name: default
 spec:
   amiFamily: AL2 # Amazon Linux 2
-  role: "${KARPENTER_NODE_ROLE}"
+  role: "${KARPENTER_ROLE}"
   subnetSelectorTerms:
     - tags:
         karpenter.sh/discovery: ${EKS_CLUSTER_NAME}
diff --git a/website/docs/autoscaling/compute/karpenter/configure.md b/website/docs/autoscaling/compute/karpenter/configure.md
index 758c3226a..1ecf5dabf 100644
--- a/website/docs/autoscaling/compute/karpenter/configure.md
+++ b/website/docs/autoscaling/compute/karpenter/configure.md
@@ -15,7 +15,7 @@ The only setup that we will need to do is to update our EKS IAM mappings to allo
 
 ```bash
 $ eksctl create iamidentitymapping --cluster $EKS_CLUSTER_NAME \
-    --region=$AWS_REGION --arn $KARPENTER_NODE_ROLE_ARN \
+    --region $AWS_REGION --arn $KARPENTER_ARN \
     --group system:bootstrappers --group system:nodes \
     --username system:node:{{EC2PrivateDNSName}}
 ```
diff --git a/website/docs/autoscaling/compute/karpenter/index.md b/website/docs/autoscaling/compute/karpenter/index.md
index 2491e3d3d..188ad344f 100644
--- a/website/docs/autoscaling/compute/karpenter/index.md
+++ b/website/docs/autoscaling/compute/karpenter/index.md
@@ -7,7 +7,7 @@ sidebar_custom_props: {"module": true}
 :::tip Before you start
 Prepare your environment for this section:
 
-```bash timeout=300 wait=30
+```bash timeout=900 wait=30
 $ prepare-environment autoscaling/compute/karpenter
 ```
 
diff --git a/website/docs/autoscaling/compute/karpenter/tests/hook-karpenter-deployment.sh b/website/docs/autoscaling/compute/karpenter/tests/hook-karpenter-deployment.sh
index 6c5ac5645..c96137ced 100644
--- a/website/docs/autoscaling/compute/karpenter/tests/hook-karpenter-deployment.sh
+++ b/website/docs/autoscaling/compute/karpenter/tests/hook-karpenter-deployment.sh
@@ -5,7 +5,7 @@ before() {
 }
 
 after() {
-  sleep 10
+  sleep 30
 
   num_nodes=$(kubectl get nodes --selector=type=karpenter -o json | jq -r '.items | length')