From 6fd86e6b975ee6c395642f2241d7c6ed042d181b Mon Sep 17 00:00:00 2001 From: Kirill Kramorov Date: Wed, 18 Sep 2024 12:54:35 +0700 Subject: [PATCH] [feat] test b64 Signed-off-by: Kirill Kramorov --- .github/workflows/e2e-abort-aws.yml | 24 +-- .github/workflows/e2e-abort-azure.yml | 24 +-- .github/workflows/e2e-abort-eks.yml | 12 +- .github/workflows/e2e-abort-gcp.yml | 24 +-- .github/workflows/e2e-abort-openstack.yml | 24 +-- .github/workflows/e2e-abort-static.yml | 24 +-- .github/workflows/e2e-abort-vcd.yml | 24 +-- .github/workflows/e2e-abort-vsphere.yml | 24 +-- .github/workflows/e2e-abort-yandex-cloud.yml | 24 +-- .github/workflows/e2e-aws.yml | 120 +++++++------- .github/workflows/e2e-azure.yml | 120 +++++++------- .github/workflows/e2e-daily.yml | 160 +++++++++---------- .github/workflows/e2e-eks.yml | 96 +++++------ .github/workflows/e2e-gcp.yml | 120 +++++++------- .github/workflows/e2e-openstack.yml | 120 +++++++------- .github/workflows/e2e-static.yml | 120 +++++++------- .github/workflows/e2e-vcd.yml | 120 +++++++------- .github/workflows/e2e-vsphere.yml | 120 +++++++------- .github/workflows/e2e-yandex-cloud.yml | 120 +++++++------- 19 files changed, 710 insertions(+), 710 deletions(-) diff --git a/.github/workflows/e2e-abort-aws.yml b/.github/workflows/e2e-abort-aws.yml index f95c8f2baa..5744883236 100644 --- a/.github/workflows/e2e-abort-aws.yml +++ b/.github/workflows/e2e-abort-aws.yml @@ -252,7 +252,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -266,7 +266,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -532,7 +532,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -546,7 +546,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -812,7 +812,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -826,7 +826,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1092,7 +1092,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1106,7 +1106,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1372,7 +1372,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1386,7 +1386,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1652,7 +1652,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1666,7 +1666,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-abort-azure.yml b/.github/workflows/e2e-abort-azure.yml index cd840721a8..8336932658 100644 --- a/.github/workflows/e2e-abort-azure.yml +++ b/.github/workflows/e2e-abort-azure.yml @@ -254,7 +254,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -268,7 +268,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -538,7 +538,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -552,7 +552,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -822,7 +822,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -836,7 +836,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1106,7 +1106,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1120,7 +1120,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1390,7 +1390,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1404,7 +1404,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1674,7 +1674,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1688,7 +1688,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-abort-eks.yml b/.github/workflows/e2e-abort-eks.yml index 0d42b83e7e..8d9d2e429a 100644 --- a/.github/workflows/e2e-abort-eks.yml +++ b/.github/workflows/e2e-abort-eks.yml @@ -258,7 +258,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -540,7 +540,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -822,7 +822,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1104,7 +1104,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1386,7 +1386,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1668,7 +1668,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing diff --git a/.github/workflows/e2e-abort-gcp.yml b/.github/workflows/e2e-abort-gcp.yml index dfcf87af47..e78b01f6df 100644 --- a/.github/workflows/e2e-abort-gcp.yml +++ b/.github/workflows/e2e-abort-gcp.yml @@ -251,7 +251,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -265,7 +265,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -529,7 +529,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -543,7 +543,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -807,7 +807,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -821,7 +821,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1085,7 +1085,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1099,7 +1099,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1363,7 +1363,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1377,7 +1377,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1641,7 +1641,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1655,7 +1655,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-abort-openstack.yml b/.github/workflows/e2e-abort-openstack.yml index de6f962179..d3db1d22d2 100644 --- a/.github/workflows/e2e-abort-openstack.yml +++ b/.github/workflows/e2e-abort-openstack.yml @@ -251,7 +251,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -265,7 +265,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -529,7 +529,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -543,7 +543,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -807,7 +807,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -821,7 +821,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1085,7 +1085,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1099,7 +1099,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1363,7 +1363,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1377,7 +1377,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1641,7 +1641,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1655,7 +1655,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-abort-static.yml b/.github/workflows/e2e-abort-static.yml index c0f6c988d7..46b16330aa 100644 --- a/.github/workflows/e2e-abort-static.yml +++ b/.github/workflows/e2e-abort-static.yml @@ -251,7 +251,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -265,7 +265,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -529,7 +529,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -543,7 +543,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -807,7 +807,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -821,7 +821,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1085,7 +1085,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1099,7 +1099,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1363,7 +1363,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1377,7 +1377,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1641,7 +1641,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1655,7 +1655,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-abort-vcd.yml b/.github/workflows/e2e-abort-vcd.yml index 33867f9ea9..7a9fd42831 100644 --- a/.github/workflows/e2e-abort-vcd.yml +++ b/.github/workflows/e2e-abort-vcd.yml @@ -255,7 +255,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -269,7 +269,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -541,7 +541,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -555,7 +555,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -827,7 +827,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -841,7 +841,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1113,7 +1113,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1127,7 +1127,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1399,7 +1399,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1413,7 +1413,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1685,7 +1685,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1699,7 +1699,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-abort-vsphere.yml b/.github/workflows/e2e-abort-vsphere.yml index 65efd957cf..a273a491e6 100644 --- a/.github/workflows/e2e-abort-vsphere.yml +++ b/.github/workflows/e2e-abort-vsphere.yml @@ -252,7 +252,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -266,7 +266,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -532,7 +532,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -546,7 +546,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -812,7 +812,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -826,7 +826,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1092,7 +1092,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1106,7 +1106,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1372,7 +1372,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1386,7 +1386,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1652,7 +1652,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1666,7 +1666,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-abort-yandex-cloud.yml b/.github/workflows/e2e-abort-yandex-cloud.yml index 63d1d96bd8..d235a06074 100644 --- a/.github/workflows/e2e-abort-yandex-cloud.yml +++ b/.github/workflows/e2e-abort-yandex-cloud.yml @@ -253,7 +253,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -267,7 +267,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -535,7 +535,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -549,7 +549,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -817,7 +817,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -831,7 +831,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1099,7 +1099,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1113,7 +1113,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1381,7 +1381,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1395,7 +1395,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1663,7 +1663,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1677,7 +1677,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-aws.yml b/.github/workflows/e2e-aws.yml index ad2c4b136f..3408d29d49 100644 --- a/.github/workflows/e2e-aws.yml +++ b/.github/workflows/e2e-aws.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -458,7 +458,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -490,7 +490,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -545,7 +545,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -567,7 +567,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -581,7 +581,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -885,11 +885,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -905,7 +905,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -921,7 +921,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -944,7 +944,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -976,7 +976,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1031,7 +1031,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1053,7 +1053,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1067,7 +1067,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1371,11 +1371,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1391,7 +1391,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1407,7 +1407,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1430,7 +1430,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1462,7 +1462,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1517,7 +1517,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1539,7 +1539,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1553,7 +1553,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1857,11 +1857,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1877,7 +1877,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1893,7 +1893,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1916,7 +1916,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1948,7 +1948,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2003,7 +2003,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2025,7 +2025,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2039,7 +2039,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2343,11 +2343,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2363,7 +2363,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2379,7 +2379,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2402,7 +2402,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2434,7 +2434,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2489,7 +2489,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2511,7 +2511,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2525,7 +2525,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2829,11 +2829,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2849,7 +2849,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2865,7 +2865,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2888,7 +2888,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2920,7 +2920,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2975,7 +2975,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2997,7 +2997,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3011,7 +3011,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-azure.yml b/.github/workflows/e2e-azure.yml index 2bad6fcec1..e8e26a1ba0 100644 --- a/.github/workflows/e2e-azure.yml +++ b/.github/workflows/e2e-azure.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -460,7 +460,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -492,7 +492,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -549,7 +549,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -573,7 +573,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -587,7 +587,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -893,11 +893,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -913,7 +913,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -929,7 +929,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -954,7 +954,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -986,7 +986,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1043,7 +1043,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1067,7 +1067,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1081,7 +1081,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1387,11 +1387,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1407,7 +1407,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1423,7 +1423,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1448,7 +1448,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1480,7 +1480,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1537,7 +1537,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1561,7 +1561,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1575,7 +1575,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1881,11 +1881,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1901,7 +1901,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1917,7 +1917,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1942,7 +1942,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1974,7 +1974,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2031,7 +2031,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2055,7 +2055,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2069,7 +2069,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2375,11 +2375,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2395,7 +2395,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2411,7 +2411,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2436,7 +2436,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2468,7 +2468,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2525,7 +2525,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2549,7 +2549,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2563,7 +2563,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2869,11 +2869,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2889,7 +2889,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2905,7 +2905,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2930,7 +2930,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2962,7 +2962,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -3019,7 +3019,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -3043,7 +3043,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3057,7 +3057,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-daily.yml b/.github/workflows/e2e-daily.yml index ec03cd03c2..2846974b6f 100644 --- a/.github/workflows/e2e-daily.yml +++ b/.github/workflows/e2e-daily.yml @@ -319,11 +319,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -339,7 +339,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -355,7 +355,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -378,7 +378,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -392,7 +392,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -427,7 +427,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -449,7 +449,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -463,7 +463,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -776,11 +776,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -796,7 +796,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -812,7 +812,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -837,7 +837,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -851,7 +851,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -888,7 +888,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -912,7 +912,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -926,7 +926,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1241,11 +1241,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1261,7 +1261,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1277,7 +1277,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1299,7 +1299,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1313,7 +1313,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1347,7 +1347,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1368,7 +1368,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1382,7 +1382,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1694,11 +1694,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1714,7 +1714,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1730,7 +1730,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1754,7 +1754,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1768,7 +1768,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1804,7 +1804,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1827,7 +1827,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1841,7 +1841,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2155,11 +2155,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2175,7 +2175,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2191,7 +2191,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2213,7 +2213,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2227,7 +2227,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2261,7 +2261,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2282,7 +2282,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2296,7 +2296,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2608,11 +2608,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2628,7 +2628,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2644,7 +2644,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2667,7 +2667,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2681,7 +2681,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2716,7 +2716,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2738,7 +2738,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2752,7 +2752,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -3065,11 +3065,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -3085,7 +3085,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -3101,7 +3101,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -3127,7 +3127,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3141,7 +3141,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -3179,7 +3179,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -3204,7 +3204,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3218,7 +3218,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -3534,11 +3534,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -3554,7 +3554,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -3570,7 +3570,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -3592,7 +3592,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3606,7 +3606,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -3640,7 +3640,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -3661,7 +3661,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3675,7 +3675,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-eks.yml b/.github/workflows/e2e-eks.yml index ee001e974d..5453b19d43 100644 --- a/.github/workflows/e2e-eks.yml +++ b/.github/workflows/e2e-eks.yml @@ -403,11 +403,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -425,7 +425,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -441,7 +441,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -466,7 +466,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -588,7 +588,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -612,7 +612,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -930,11 +930,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -952,7 +952,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -968,7 +968,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -993,7 +993,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1115,7 +1115,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -1139,7 +1139,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1457,11 +1457,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1479,7 +1479,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1495,7 +1495,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -1520,7 +1520,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1642,7 +1642,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -1666,7 +1666,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1984,11 +1984,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2006,7 +2006,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2022,7 +2022,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -2047,7 +2047,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2169,7 +2169,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -2193,7 +2193,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2511,11 +2511,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2533,7 +2533,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2549,7 +2549,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -2574,7 +2574,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2696,7 +2696,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -2720,7 +2720,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3038,11 +3038,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -3060,7 +3060,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -3076,7 +3076,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -3101,7 +3101,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3223,7 +3223,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} TERRAFORM_IMAGE_NAME: ${{ steps.setup.outputs.terraform-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} @@ -3247,7 +3247,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing diff --git a/.github/workflows/e2e-gcp.yml b/.github/workflows/e2e-gcp.yml index 6eddd7602f..19a5979f70 100644 --- a/.github/workflows/e2e-gcp.yml +++ b/.github/workflows/e2e-gcp.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -457,7 +457,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -489,7 +489,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -543,7 +543,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -564,7 +564,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -578,7 +578,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -881,11 +881,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -901,7 +901,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -917,7 +917,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -939,7 +939,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -971,7 +971,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1025,7 +1025,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1046,7 +1046,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1060,7 +1060,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1363,11 +1363,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1383,7 +1383,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1399,7 +1399,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1421,7 +1421,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1453,7 +1453,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1507,7 +1507,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1528,7 +1528,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1542,7 +1542,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1845,11 +1845,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1865,7 +1865,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1881,7 +1881,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1903,7 +1903,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1935,7 +1935,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1989,7 +1989,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2010,7 +2010,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2024,7 +2024,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2327,11 +2327,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2347,7 +2347,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2363,7 +2363,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2385,7 +2385,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2417,7 +2417,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2471,7 +2471,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2492,7 +2492,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2506,7 +2506,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2809,11 +2809,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2829,7 +2829,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2845,7 +2845,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2867,7 +2867,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2899,7 +2899,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2953,7 +2953,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2974,7 +2974,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2988,7 +2988,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-openstack.yml b/.github/workflows/e2e-openstack.yml index 6d05b79f3d..5f93010ea0 100644 --- a/.github/workflows/e2e-openstack.yml +++ b/.github/workflows/e2e-openstack.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -457,7 +457,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -489,7 +489,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -543,7 +543,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -564,7 +564,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -578,7 +578,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -881,11 +881,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -901,7 +901,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -917,7 +917,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -939,7 +939,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -971,7 +971,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1025,7 +1025,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1046,7 +1046,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1060,7 +1060,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1363,11 +1363,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1383,7 +1383,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1399,7 +1399,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1421,7 +1421,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1453,7 +1453,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1507,7 +1507,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1528,7 +1528,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1542,7 +1542,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1845,11 +1845,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1865,7 +1865,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1881,7 +1881,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1903,7 +1903,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1935,7 +1935,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1989,7 +1989,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2010,7 +2010,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2024,7 +2024,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2327,11 +2327,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2347,7 +2347,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2363,7 +2363,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2385,7 +2385,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2417,7 +2417,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2471,7 +2471,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2492,7 +2492,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2506,7 +2506,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2809,11 +2809,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2829,7 +2829,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2845,7 +2845,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2867,7 +2867,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2899,7 +2899,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2953,7 +2953,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2974,7 +2974,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2988,7 +2988,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-static.yml b/.github/workflows/e2e-static.yml index 5f1f290c03..cb3fdcb66c 100644 --- a/.github/workflows/e2e-static.yml +++ b/.github/workflows/e2e-static.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -457,7 +457,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -489,7 +489,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -543,7 +543,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -564,7 +564,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -578,7 +578,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -881,11 +881,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -901,7 +901,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -917,7 +917,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -939,7 +939,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -971,7 +971,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1025,7 +1025,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1046,7 +1046,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1060,7 +1060,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1363,11 +1363,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1383,7 +1383,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1399,7 +1399,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1421,7 +1421,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1453,7 +1453,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1507,7 +1507,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1528,7 +1528,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1542,7 +1542,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1845,11 +1845,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1865,7 +1865,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1881,7 +1881,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1903,7 +1903,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1935,7 +1935,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1989,7 +1989,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2010,7 +2010,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2024,7 +2024,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2327,11 +2327,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2347,7 +2347,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2363,7 +2363,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2385,7 +2385,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2417,7 +2417,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2471,7 +2471,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2492,7 +2492,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2506,7 +2506,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2809,11 +2809,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2829,7 +2829,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2845,7 +2845,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2867,7 +2867,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2899,7 +2899,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2953,7 +2953,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2974,7 +2974,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2988,7 +2988,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-vcd.yml b/.github/workflows/e2e-vcd.yml index b1f69a7d14..461e9accc6 100644 --- a/.github/workflows/e2e-vcd.yml +++ b/.github/workflows/e2e-vcd.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -461,7 +461,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -493,7 +493,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -551,7 +551,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -576,7 +576,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -590,7 +590,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -897,11 +897,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -917,7 +917,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -933,7 +933,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -959,7 +959,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -991,7 +991,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1049,7 +1049,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1074,7 +1074,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1088,7 +1088,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1395,11 +1395,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1415,7 +1415,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1431,7 +1431,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1457,7 +1457,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1489,7 +1489,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1547,7 +1547,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1572,7 +1572,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1586,7 +1586,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1893,11 +1893,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1913,7 +1913,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1929,7 +1929,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1955,7 +1955,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1987,7 +1987,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2045,7 +2045,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2070,7 +2070,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2084,7 +2084,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2391,11 +2391,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2411,7 +2411,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2427,7 +2427,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2453,7 +2453,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2485,7 +2485,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2543,7 +2543,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2568,7 +2568,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2582,7 +2582,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2889,11 +2889,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2909,7 +2909,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2925,7 +2925,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2951,7 +2951,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2983,7 +2983,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -3041,7 +3041,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -3066,7 +3066,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3080,7 +3080,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-vsphere.yml b/.github/workflows/e2e-vsphere.yml index 4e2248ddca..54687fe0cd 100644 --- a/.github/workflows/e2e-vsphere.yml +++ b/.github/workflows/e2e-vsphere.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -458,7 +458,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -490,7 +490,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -545,7 +545,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -567,7 +567,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -581,7 +581,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -885,11 +885,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -905,7 +905,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -921,7 +921,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -944,7 +944,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -976,7 +976,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1031,7 +1031,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1053,7 +1053,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1067,7 +1067,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1371,11 +1371,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1391,7 +1391,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1407,7 +1407,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1430,7 +1430,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1462,7 +1462,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1517,7 +1517,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1539,7 +1539,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1553,7 +1553,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1857,11 +1857,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1877,7 +1877,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1893,7 +1893,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1916,7 +1916,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1948,7 +1948,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2003,7 +2003,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2025,7 +2025,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2039,7 +2039,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2343,11 +2343,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2363,7 +2363,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2379,7 +2379,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2402,7 +2402,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2434,7 +2434,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2489,7 +2489,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2511,7 +2511,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2525,7 +2525,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2829,11 +2829,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2849,7 +2849,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2865,7 +2865,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2888,7 +2888,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2920,7 +2920,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2975,7 +2975,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2997,7 +2997,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3011,7 +3011,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ diff --git a/.github/workflows/e2e-yandex-cloud.yml b/.github/workflows/e2e-yandex-cloud.yml index f67eca96df..b91798a29a 100644 --- a/.github/workflows/e2e-yandex-cloud.yml +++ b/.github/workflows/e2e-yandex-cloud.yml @@ -399,11 +399,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -419,7 +419,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -435,7 +435,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -459,7 +459,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -491,7 +491,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -547,7 +547,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -570,7 +570,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -584,7 +584,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -889,11 +889,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -909,7 +909,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -925,7 +925,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -949,7 +949,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -981,7 +981,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1037,7 +1037,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1060,7 +1060,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1074,7 +1074,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1379,11 +1379,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1399,7 +1399,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1415,7 +1415,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1439,7 +1439,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1471,7 +1471,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1527,7 +1527,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -1550,7 +1550,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1564,7 +1564,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -1869,11 +1869,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -1889,7 +1889,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -1905,7 +1905,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -1929,7 +1929,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -1961,7 +1961,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2017,7 +2017,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2040,7 +2040,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2054,7 +2054,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2359,11 +2359,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2379,7 +2379,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2395,7 +2395,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2419,7 +2419,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2451,7 +2451,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2507,7 +2507,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -2530,7 +2530,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2544,7 +2544,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2849,11 +2849,11 @@ jobs: echo "Deckhouse Deployment will use install image ${SAFE_IMAGE_NAME} to test Git ref ${REF_FULL}" if [ "${MULTIMASTER}" == true ] ; then - MASTER_COUNT=3 + MASTERS_COUNT=3 else - MASTER_COUNT=1 + MASTERS_COUNT=1 fi - echo "Multimaster set ${MULTIMASTER}, MASTER_COUNT set ${MASTER_COUNT}" + echo "Multimaster set ${MULTIMASTER}, MASTERS_COUNT set ${MASTERS_COUNT}" # Print image name in uppercase to prevent hiding non-secret registry host stored in secret. echo "⚓️ [$(date -u)] Pull 'dev/install' image '${SAFE_IMAGE_NAME}'." @@ -2869,7 +2869,7 @@ jobs: echo "deckhouse-image-tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "initial-image-tag=${INITIAL_IMAGE_TAG}" >> $GITHUB_OUTPUT echo "install-image-path=${IMAGE_INSTALL_PATH}" >> $GITHUB_OUTPUT - echo "master-count=${MASTER_COUNT}" >> $GITHUB_OUTPUT + echo "masters-count=${MASTERS_COUNT}" >> $GITHUB_OUTPUT echo '::echo::off' @@ -2885,7 +2885,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count}} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count}} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} INITIAL_IMAGE_TAG: ${{ steps.setup.outputs.initial-image-tag }} @@ -2909,7 +2909,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -2941,7 +2941,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \ @@ -2997,7 +2997,7 @@ jobs: LAYOUT_SSH_KEY: ${{ secrets.LAYOUT_SSH_KEY}} TMP_DIR_PATH: ${{ steps.setup.outputs.tmp-dir-path}} PREFIX: ${{ steps.setup.outputs.dhctl-prefix}} - MASTER_COUNT: ${{ steps.setup.outputs.master-count }} + MASTERS_COUNT: ${{ steps.setup.outputs.masters-count }} INSTALL_IMAGE_NAME: ${{ steps.setup.outputs.install-image-name }} DECKHOUSE_IMAGE_TAG: ${{ steps.setup.outputs.deckhouse-image-tag }} # @@ -3020,7 +3020,7 @@ jobs: LAYOUT=${LAYOUT} KUBERNETES_VERSION=${KUBERNETES_VERSION} TMP_DIR_PATH=${TMP_DIR_PATH} - MASTER_COUNT=${MASTER_COUNT} + MASTERS_COUNT=${MASTER_COUNT} " ls -lh $(pwd)/testing @@ -3034,7 +3034,7 @@ jobs: docker run --rm \ -e DECKHOUSE_DOCKERCFG=${LAYOUT_DECKHOUSE_DOCKERCFG} \ -e PREFIX=${PREFIX} \ - -e MASTER_COUNT=${MASTER_COUNT} \ + -e MASTERS_COUNT=${MASTER_COUNT} \ -e DECKHOUSE_IMAGE_TAG=${DECKHOUSE_IMAGE_TAG} \ -e INITIAL_IMAGE_TAG=${INITIAL_IMAGE_TAG} \ -e KUBERNETES_VERSION=${KUBERNETES_VERSION} \