From 7ea48dddefcb75cea70b72a62ddf18994a85343a Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Wed, 2 Aug 2023 10:45:32 +0200 Subject: [PATCH] ci: update actions to use nodeGroups and remove deprecated flags --- .github/actions/constellation_create/action.yml | 12 ++++++++---- .github/workflows/e2e-windows.yml | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml index e381c60ba..6eca79b40 100644 --- a/.github/actions/constellation_create/action.yml +++ b/.github/actions/constellation_create/action.yml @@ -182,9 +182,13 @@ runs: if: inputs.machineType && inputs.machineType != 'default' shell: bash run: | - yq eval -i "(.provider | select(. | has(\"azure\")).azure.instanceType) = \"${{ inputs.machineType }}\"" constellation-conf.yaml - yq eval -i "(.provider | select(. | has(\"gcp\")).gcp.instanceType) = \"${{ inputs.machineType }}\"" constellation-conf.yaml - yq eval -i "(.provider | select(. | has(\"aws\")).aws.instanceType) = \"${{ inputs.machineType }}\"" constellation-conf.yaml + yq eval -i "(.nodeGroups[] | .instanceType) = \"${{ inputs.machineType }}\"" constellation-conf.yaml + + - name: Set node count + shell: bash + run: | + yq eval -i "(.nodeGroups[] | select(.role == "control-plane") | .initialCount) = \"${{ inputs.controlNodesCount }}\"" constellation-conf.yaml + yq eval -i "(.nodeGroups[] | select(.role == "worker") | .initialCount) = \"${{ inputs.workerNodesCount }}\"" constellation-conf.yaml - name: Create serviceAccountKey.json if: inputs.cloudProvider == 'gcp' && !inputs.existingConfig # Skip if using existing config. serviceAccountKey.json is already present in that case. @@ -214,7 +218,7 @@ runs: if [[ $output == *"tf-log"* ]]; then TFFLAG="--tf-log=DEBUG" fi - constellation create -c ${{ inputs.controlNodesCount }} -w ${{ inputs.workerNodesCount }} -y --force --debug ${TFFLAG:-} + constellation create -y --force --debug ${TFFLAG:-} - name: Cdbg deploy if: inputs.isDebugImage == 'true' diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml index 3a5877dac..a35464f81 100644 --- a/.github/workflows/e2e-windows.yml +++ b/.github/workflows/e2e-windows.yml @@ -68,7 +68,7 @@ jobs: - name: Create cluster shell: pwsh run: | - .\constellation.exe create --control-plane-nodes 1 --worker-nodes 2 --debug -y + .\constellation.exe create --debug -y - name: Initialize cluster shell: pwsh