From 2bb3b8265793ed2d96dcdcdf81352ec13d608053 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Sun, 17 Dec 2023 01:06:11 +0000
Subject: [PATCH] Auto commit - CI build

---
 amazon-eks-ami/.github/actions/ci/build/action.yaml | 1 +
 amazon-eks-ami/files/bootstrap.sh                   | 2 +-
 amazon-eks-ami/files/get-ecr-uri.sh                 | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/amazon-eks-ami/.github/actions/ci/build/action.yaml b/amazon-eks-ami/.github/actions/ci/build/action.yaml
index 822617ab..5b91c3d0 100644
--- a/amazon-eks-ami/.github/actions/ci/build/action.yaml
+++ b/amazon-eks-ami/.github/actions/ci/build/action.yaml
@@ -24,6 +24,7 @@ runs:
     - id: build
       shell: bash
       run: |
+        packer plugins install github.com/hashicorp/amazon
         AMI_NAME="amazon-eks-node-${{ inputs.k8s_version }}-${{ inputs.build_id }}"
         make ${{ inputs.k8s_version }} ami_name=${AMI_NAME} ${{ inputs.additional_arguments }}
         echo "ami_id=$(jq -r .builds[0].artifact_id "${AMI_NAME}-manifest.json" | cut -d ':' -f 2)" >> $GITHUB_OUTPUT
diff --git a/amazon-eks-ami/files/bootstrap.sh b/amazon-eks-ami/files/bootstrap.sh
index f7327868..42567a49 100755
--- a/amazon-eks-ami/files/bootstrap.sh
+++ b/amazon-eks-ami/files/bootstrap.sh
@@ -345,7 +345,7 @@ CA_CERTIFICATE_DIRECTORY=/etc/kubernetes/pki
 CA_CERTIFICATE_FILE_PATH=$CA_CERTIFICATE_DIRECTORY/ca.crt
 mkdir -p $CA_CERTIFICATE_DIRECTORY
 if [[ -z "${B64_CLUSTER_CA}" ]] || [[ -z "${APISERVER_ENDPOINT}" ]]; then
-  log "INFO: --cluster-ca or --api-server-endpoint is not defined, describing cluster..."
+  log "INFO: --b64-cluster-ca or --apiserver-endpoint is not defined, describing cluster..."
   DESCRIBE_CLUSTER_RESULT="/tmp/describe_cluster_result.txt"
 
   # Retry the DescribeCluster API for API_RETRY_ATTEMPTS
diff --git a/amazon-eks-ami/files/get-ecr-uri.sh b/amazon-eks-ami/files/get-ecr-uri.sh
index 3a5bad0b..3dc56523 100755
--- a/amazon-eks-ami/files/get-ecr-uri.sh
+++ b/amazon-eks-ami/files/get-ecr-uri.sh
@@ -63,6 +63,9 @@ else
     il-central-1)
       acct="066635153087"
       ;;
+    ca-west-1)
+      acct="761377655185"
+      ;;
     # This sections includes all commercial non-opt-in regions, which use
     # the same account for ECR pause container images, but still have in-region
     # registries.