Merge branch 'create-karpenter-snapshot-for-fork'

engedaam · Jan 9, 2024 · adef310 · adef310
2 parents 5de5021 + da61b0b
commit adef310
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml
@@ -8,7 +8,6 @@ jobs:
   release:
     permissions:
       id-token: write # aws-actions/[email protected]
-    if: github.repository == 'aws/karpenter-provider-aws'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/hack/release/common.sh b/hack/release/common.sh
@@ -3,12 +3,13 @@ set -euo pipefail
 
 config(){
   GITHUB_ACCOUNT="aws"
+  AWS_ACCOUNT_ID="605559265918"
   ECR_GALLERY_NAME="karpenter"
   RELEASE_REPO_ECR=${RELEASE_REPO_ECR:-public.ecr.aws/${ECR_GALLERY_NAME}/}
   RELEASE_REPO_GH=${RELEASE_REPO_GH:-ghcr.io/${GITHUB_ACCOUNT}/karpenter}
 
-  SNAPSHOT_ECR="021119463062.dkr.ecr.us-east-1.amazonaws.com"
-  SNAPSHOT_REPO_ECR=${SNAPSHOT_REPO_ECR:-${SNAPSHOT_ECR}/karpenter/snapshot/}
+  PRIVATE_HOST="${AWS_ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com"
+  SNAPSHOT_REPO_ECR=${SNAPSHOT_REPO_ECR:-${PRIVATE_HOST}/karpenter/snapshot/}
 
   CURRENT_MAJOR_VERSION="0"
   RELEASE_PLATFORM="--platform=linux/amd64,linux/arm64"
@@ -59,11 +60,11 @@ Helm Chart Version $(helmChartVersion $RELEASE_VERSION)"
 }
 
 authenticate() {
-  aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin "${RELEASE_REPO_ECR}"
+  aws ecr-public get-login-password --region us-west-2 | docker login --username AWS --password-stdin "${RELEASE_REPO_ECR}"
 }
 
 authenticatePrivateRepo() {
-  aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin "${SNAPSHOT_ECR}"
+  aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${PRIVATE_HOST}
 }
 
 buildImages() {