diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index d1969b579c65..c3d06099868d 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -9,7 +9,6 @@ jobs: snapshot: permissions: id-token: write # aws-actions/configure-aws-credentials@v4.0.1 - if: github.repository == 'aws/karpenter-provider-aws' runs-on: ubuntu-latest steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 diff --git a/hack/release/common.sh b/hack/release/common.sh index 04a1c26286d4..05af3364b280 100644 --- a/hack/release/common.sh +++ b/hack/release/common.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash set -euo pipefail +AWS_ACCOUNT_ID="069919849861" ECR_GALLERY_NAME="karpenter" RELEASE_REPO_ECR="${RELEASE_REPO_ECR:-public.ecr.aws/${ECR_GALLERY_NAME}/}" -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" @@ -42,11 +43,11 @@ Helm Chart Version ${helm_chart_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}" } build() {