From 55a9e2cbecb32904c3dc61aec08d9835a72cb6cf Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Mon, 12 Feb 2024 15:54:49 -0800 Subject: [PATCH 01/14] X-Smart-Branch-Parent: main From c8aa08a53cd82edc78ea49c7416f69f9d0f7ef91 Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Mon, 12 Feb 2024 16:00:08 -0800 Subject: [PATCH 02/14] Installing roxctl --- .github/workflows/create-demo-clusters.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index a920c84..95f942f 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -300,6 +300,9 @@ jobs: id: artifacts run: | infractl artifacts "${NAME//./-}" -d artifacts >> "$GITHUB_STEP_SUMMARY" + - name: Install roxctl + run: | + make cli - name: Launch central id: launch-central uses: ./.actions/release/start-acs From 0d4188d7608d7082b498da66d80797782a890a1d Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Mon, 12 Feb 2024 17:30:33 -0800 Subject: [PATCH 03/14] Not trying to move roxctl to /usr/bin --- .github/workflows/create-demo-clusters.yml | 2 +- release/start-acs/start-acs.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index 95f942f..ac67857 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -302,7 +302,7 @@ jobs: infractl artifacts "${NAME//./-}" -d artifacts >> "$GITHUB_STEP_SUMMARY" - name: Install roxctl run: | - make cli + make cli-linux - name: Launch central id: launch-central uses: ./.actions/release/start-acs diff --git a/release/start-acs/start-acs.sh b/release/start-acs/start-acs.sh index d429744..e477449 100755 --- a/release/start-acs/start-acs.sh +++ b/release/start-acs/start-acs.sh @@ -29,6 +29,8 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" # shellcheck source=/dev/null source "${STACKROX_DIR}"/deploy/common/deploy.sh +alias roxctl="${STACKROX_DIR}"/bin/linux_arm64/roxctl + gh_log notice "Deploying central..." "${STACKROX_DIR}"/deploy/k8s/central.sh From efe970d28eaf3c959b7d09e299585601f681943d Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Mon, 12 Feb 2024 21:40:27 -0800 Subject: [PATCH 04/14] Giving correct permissions to roxctl --- .github/workflows/create-demo-clusters.yml | 2 +- release/start-acs/start-acs.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index ac67857..c65c6f2 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -302,7 +302,7 @@ jobs: infractl artifacts "${NAME//./-}" -d artifacts >> "$GITHUB_STEP_SUMMARY" - name: Install roxctl run: | - make cli-linux + make cli_linux-amd64 - name: Launch central id: launch-central uses: ./.actions/release/start-acs diff --git a/release/start-acs/start-acs.sh b/release/start-acs/start-acs.sh index e477449..323c866 100755 --- a/release/start-acs/start-acs.sh +++ b/release/start-acs/start-acs.sh @@ -30,6 +30,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" source "${STACKROX_DIR}"/deploy/common/deploy.sh alias roxctl="${STACKROX_DIR}"/bin/linux_arm64/roxctl +chmod 755 "${STACKROX_DIR}"/bin/linux_arm64/roxctl gh_log notice "Deploying central..." "${STACKROX_DIR}"/deploy/k8s/central.sh From bea366d2445f8d429e6bf6cfb0e1b99649d723d3 Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Mon, 12 Feb 2024 23:54:53 -0800 Subject: [PATCH 05/14] sudo make cli-install --- .github/workflows/create-demo-clusters.yml | 1 + release/start-acs/start-acs.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index c65c6f2..b2b76c8 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -303,6 +303,7 @@ jobs: - name: Install roxctl run: | make cli_linux-amd64 + sudo make cli-install - name: Launch central id: launch-central uses: ./.actions/release/start-acs diff --git a/release/start-acs/start-acs.sh b/release/start-acs/start-acs.sh index 323c866..c0e1ffc 100755 --- a/release/start-acs/start-acs.sh +++ b/release/start-acs/start-acs.sh @@ -29,8 +29,8 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" # shellcheck source=/dev/null source "${STACKROX_DIR}"/deploy/common/deploy.sh -alias roxctl="${STACKROX_DIR}"/bin/linux_arm64/roxctl -chmod 755 "${STACKROX_DIR}"/bin/linux_arm64/roxctl +#alias roxctl="${STACKROX_DIR}"/bin/linux_arm64/roxctl +#chmod 755 "${STACKROX_DIR}"/bin/linux_arm64/roxctl gh_log notice "Deploying central..." "${STACKROX_DIR}"/deploy/k8s/central.sh From 90e39e4cff2908dc42686e5821e7a2f027ea436f Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 00:03:59 -0800 Subject: [PATCH 06/14] Not using sudo using ~/.local/bin/ instead --- .github/workflows/create-demo-clusters.yml | 1 - release/start-acs/start-acs.sh | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index b2b76c8..c65c6f2 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -303,7 +303,6 @@ jobs: - name: Install roxctl run: | make cli_linux-amd64 - sudo make cli-install - name: Launch central id: launch-central uses: ./.actions/release/start-acs diff --git a/release/start-acs/start-acs.sh b/release/start-acs/start-acs.sh index c0e1ffc..0d5aba9 100755 --- a/release/start-acs/start-acs.sh +++ b/release/start-acs/start-acs.sh @@ -31,6 +31,8 @@ source "${STACKROX_DIR}"/deploy/common/deploy.sh #alias roxctl="${STACKROX_DIR}"/bin/linux_arm64/roxctl #chmod 755 "${STACKROX_DIR}"/bin/linux_arm64/roxctl +cp "${STACKROX_DIR}"/bin/linux_arm64/roxctl ~/.local/bin/roxctl +chmod +x ~/.local/bin/roxctl gh_log notice "Deploying central..." "${STACKROX_DIR}"/deploy/k8s/central.sh From f3132d91ba147ae33b3278b462311a897fff047b Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 07:25:36 -0800 Subject: [PATCH 07/14] Copying and giving permissions to roxctl in the install roxctl job --- .github/workflows/create-demo-clusters.yml | 6 ++++++ release/start-acs/start-acs.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index c65c6f2..53e13b9 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -301,8 +301,14 @@ jobs: run: | infractl artifacts "${NAME//./-}" -d artifacts >> "$GITHUB_STEP_SUMMARY" - name: Install roxctl + env: + STACKROX_DIR: ${{ github.workspace }} run: | make cli_linux-amd64 + cp "${STACKROX_DIR}"/bin/linux_amd64/roxctl ~/.local/bin/roxctl + chmod +x ~/.local/bin/roxctl + ls -l ~/.local/bin/roxctl + which roxctl - name: Launch central id: launch-central uses: ./.actions/release/start-acs diff --git a/release/start-acs/start-acs.sh b/release/start-acs/start-acs.sh index 0d5aba9..4297383 100755 --- a/release/start-acs/start-acs.sh +++ b/release/start-acs/start-acs.sh @@ -31,8 +31,8 @@ source "${STACKROX_DIR}"/deploy/common/deploy.sh #alias roxctl="${STACKROX_DIR}"/bin/linux_arm64/roxctl #chmod 755 "${STACKROX_DIR}"/bin/linux_arm64/roxctl -cp "${STACKROX_DIR}"/bin/linux_arm64/roxctl ~/.local/bin/roxctl -chmod +x ~/.local/bin/roxctl +#cp "${STACKROX_DIR}"/bin/linux_arm64/roxctl ~/.local/bin/roxctl +#chmod +x ~/.local/bin/roxctl gh_log notice "Deploying central..." "${STACKROX_DIR}"/deploy/k8s/central.sh From 326e01f8330a9890ceecb0a9de74390321122a3f Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 11:31:00 -0800 Subject: [PATCH 08/14] Added mkdir -p ~/.local/bin and debugging --- .github/workflows/create-demo-clusters.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index 53e13b9..ce553c2 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -304,11 +304,13 @@ jobs: env: STACKROX_DIR: ${{ github.workspace }} run: | + mkdir -p ~/.local/bin make cli_linux-amd64 cp "${STACKROX_DIR}"/bin/linux_amd64/roxctl ~/.local/bin/roxctl chmod +x ~/.local/bin/roxctl - ls -l ~/.local/bin/roxctl - which roxctl + echo "::debug::$(ls -l ~/.local/bin/roxctl)" + echo "::debug::$(which roxctl)" + which asdf - name: Launch central id: launch-central uses: ./.actions/release/start-acs From c0e52f3efe9098e19a998534953864e7983773a1 Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 12:55:31 -0800 Subject: [PATCH 09/14] Trying to write logs to step summary --- .github/workflows/create-demo-clusters.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index ce553c2..43af8bb 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -308,8 +308,8 @@ jobs: make cli_linux-amd64 cp "${STACKROX_DIR}"/bin/linux_amd64/roxctl ~/.local/bin/roxctl chmod +x ~/.local/bin/roxctl - echo "::debug::$(ls -l ~/.local/bin/roxctl)" - echo "::debug::$(which roxctl)" + echo "$(ls -l ~/.local/bin/roxctl)" &> "$GITHUB_STEP_SUMMARY" + echo "$(which roxctl)" &> "$GITHUB_STEP_SUMMARY" which asdf - name: Launch central id: launch-central From 755c41b00c6206e0a95628ce5a7d1129a57e85e9 Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 12:56:50 -0800 Subject: [PATCH 10/14] Trying to write logs to step summary --- .github/workflows/create-demo-clusters.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index 43af8bb..b23bcf6 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -308,8 +308,8 @@ jobs: make cli_linux-amd64 cp "${STACKROX_DIR}"/bin/linux_amd64/roxctl ~/.local/bin/roxctl chmod +x ~/.local/bin/roxctl - echo "$(ls -l ~/.local/bin/roxctl)" &> "$GITHUB_STEP_SUMMARY" - echo "$(which roxctl)" &> "$GITHUB_STEP_SUMMARY" + ls -l ~/.local/bin/roxctl &> "$GITHUB_STEP_SUMMARY" + which roxctl &> "$GITHUB_STEP_SUMMARY" which asdf - name: Launch central id: launch-central From 2866cb1e70daf555f936cc318b964d154a3bafaf Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 13:19:44 -0800 Subject: [PATCH 11/14] set -x temporarily --- .github/workflows/create-demo-clusters.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index b23bcf6..ac5c058 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -304,6 +304,7 @@ jobs: env: STACKROX_DIR: ${{ github.workspace }} run: | + set -eoux pipefail mkdir -p ~/.local/bin make cli_linux-amd64 cp "${STACKROX_DIR}"/bin/linux_amd64/roxctl ~/.local/bin/roxctl From 01fb2d165d6e868aa88459e79ce3e91d24e94873 Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 13:40:56 -0800 Subject: [PATCH 12/14] Removed line that fails on purpose --- .github/workflows/create-demo-clusters.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index ac5c058..9c67dae 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -311,7 +311,6 @@ jobs: chmod +x ~/.local/bin/roxctl ls -l ~/.local/bin/roxctl &> "$GITHUB_STEP_SUMMARY" which roxctl &> "$GITHUB_STEP_SUMMARY" - which asdf - name: Launch central id: launch-central uses: ./.actions/release/start-acs From 1c1672c0b98fa68496bb9f9994081e7ed7677e8e Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 14:03:10 -0800 Subject: [PATCH 13/14] Installing roxctl on both clusters --- .github/workflows/create-demo-clusters.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-demo-clusters.yml b/.github/workflows/create-demo-clusters.yml index 9c67dae..7d80c5d 100644 --- a/.github/workflows/create-demo-clusters.yml +++ b/.github/workflows/create-demo-clusters.yml @@ -304,13 +304,10 @@ jobs: env: STACKROX_DIR: ${{ github.workspace }} run: | - set -eoux pipefail mkdir -p ~/.local/bin make cli_linux-amd64 cp "${STACKROX_DIR}"/bin/linux_amd64/roxctl ~/.local/bin/roxctl chmod +x ~/.local/bin/roxctl - ls -l ~/.local/bin/roxctl &> "$GITHUB_STEP_SUMMARY" - which roxctl &> "$GITHUB_STEP_SUMMARY" - name: Launch central id: launch-central uses: ./.actions/release/start-acs @@ -397,6 +394,14 @@ jobs: id: artifacts run: | infractl artifacts "${SECURED_CLUSTER_NAME//./-}" -d artifacts + - name: Install roxctl + env: + STACKROX_DIR: ${{ github.workspace }} + run: | + mkdir -p ~/.local/bin + make cli_linux-amd64 + cp "${STACKROX_DIR}"/bin/linux_amd64/roxctl ~/.local/bin/roxctl + chmod +x ~/.local/bin/roxctl - name: Launch secured cluster id: launch-secured-cluster env: From 97ba5fc5f881abb7915a026e35207ff992ed0d9e Mon Sep 17 00:00:00 2001 From: JoukoVirtanen Date: Tue, 13 Feb 2024 15:28:17 -0800 Subject: [PATCH 14/14] Cleanup --- release/start-acs/start-acs.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/release/start-acs/start-acs.sh b/release/start-acs/start-acs.sh index 4297383..d429744 100755 --- a/release/start-acs/start-acs.sh +++ b/release/start-acs/start-acs.sh @@ -29,11 +29,6 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" # shellcheck source=/dev/null source "${STACKROX_DIR}"/deploy/common/deploy.sh -#alias roxctl="${STACKROX_DIR}"/bin/linux_arm64/roxctl -#chmod 755 "${STACKROX_DIR}"/bin/linux_arm64/roxctl -#cp "${STACKROX_DIR}"/bin/linux_arm64/roxctl ~/.local/bin/roxctl -#chmod +x ~/.local/bin/roxctl - gh_log notice "Deploying central..." "${STACKROX_DIR}"/deploy/k8s/central.sh