Skip to content

Commit

Permalink
Merge pull request #236 from engedaam/add_git_ref_to_stack_when_no_ref
Browse files Browse the repository at this point in the history
Add git_ref for no ref is mentioned
  • Loading branch information
engedaam authored Dec 14, 2023
2 parents 47c82ea + 16f41f0 commit 363eda6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/actions/e2e/setup-cluster/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ runs:
K8S_VERSION: ${{ inputs.k8s_version }}
IP_FAMILY: ${{ inputs.ip_family }}
PRIVATE_CLUSTER: ${{ inputs.private_cluster }}
GIT_REF: ${{ inputs.git_ref }}
GIT_REF: ${{ inputs.git_ref }} != '' && ${{ inputs.git_ref }} || ${{ github.base_ref }}
run: |
# Create or Upgrade the cluster based on whether the cluster already exists
cmd="create"
Expand Down Expand Up @@ -188,7 +188,7 @@ runs:
env:
ACCOUNT_ID: ${{ inputs.account_id }}
CLUSTER_NAME: ${{ inputs.cluster_name }}
GIT_REF: ${{ inputs.git_ref }}
GIT_REF: ${{ inputs.git_ref }} != '' && ${{ inputs.git_ref }} || ${{ github.base_ref }}
run: |
oidc_id=$(aws eks describe-cluster --name "$CLUSTER_NAME" --query "cluster.identity.oidc.issuer" --output text | cut -d '/' -f 3,4,5)
arn="arn:aws:iam::$ACCOUNT_ID:oidc-provider/${oidc_id}"
Expand Down

0 comments on commit 363eda6

Please sign in to comment.