diff --git a/.github/actions/e2e/setup-cluster/action.yaml b/.github/actions/e2e/setup-cluster/action.yaml index 6d3965e0ad67..0ed809c93108 100644 --- a/.github/actions/e2e/setup-cluster/action.yaml +++ b/.github/actions/e2e/setup-cluster/action.yaml @@ -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" @@ -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}"