From 52661c26b203e6e45a63591e7cbc911457d173fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Mon, 10 Jul 2023 16:08:31 -0400 Subject: [PATCH 1/7] fix: clean the workflow --- .github/workflows/publish.yaml | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e2f4b9a5..f151ba2d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -7,10 +7,12 @@ on: push: branches: - main + jobs: publish: runs-on: self-hosted steps: + - name: Setup Runner for Argo run: | cd $HOME @@ -24,14 +26,18 @@ jobs: # Move binary to path sudo mv ./argo-linux-amd64 /usr/local/bin/argo # Test installation + argo version --short + - name: Check out repository code uses: actions/checkout@v3 + - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 - run: echo ${GITHUB_REPOSITORY} - run: echo ${GITHUB_REPOSITORY_NAME_PART} - run: echo ${GITHUB_SERVER_URL} - - name: publish + + - name: Publish a new version of the docs run: | echo "commit sha ${GITHUB_SHA}" argo version --short @@ -43,11 +49,12 @@ jobs: -p gitUrlNoProtocol="git@github.com:${GITHUB_REPOSITORY_OWNER_PART_SLUG}" \ -p shortSha="${GITHUB_SHA_SHORT}" \ --wait --log - - run: echo "⭐️ the kubefirst open source platform is powered by github stars. give kubefirst one today https://github.com/kubefirst/kubefirst" + development: needs: publish runs-on: self-hosted steps: + - name: Setup Runner for Argo run: | cd $HOME @@ -62,11 +69,14 @@ jobs: sudo mv ./argo-linux-amd64 /usr/local/bin/argo # Test installation argo version --short + - name: Check out repository code uses: actions/checkout@v3 + - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 - - name: development + + - name: Deploy docs on development run: | echo "commit sha $GITHUB_SHA" argo version --short @@ -79,11 +89,12 @@ jobs: -p gitUrlNoProtocol="git@github.com:${GITHUB_REPOSITORY_OWNER_PART_SLUG}" \ -p shortSha="${GITHUB_SHA_SHORT}" \ --wait --log - - run: echo "⭐️ the kubefirst open source platform is powered by github stars. give kubefirst one today https://github.com/kubefirst/kubefirst" + staging: needs: development runs-on: self-hosted steps: + - name: Setup Runner for Argo run: | cd $HOME @@ -98,11 +109,14 @@ jobs: sudo mv ./argo-linux-amd64 /usr/local/bin/argo # Test installation argo version --short + - name: Check out repository code uses: actions/checkout@v3 + - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 - - name: staging + + - name: Deploy docs on staging run: | echo "commit sha $GITHUB_SHA" argo version --short @@ -115,11 +129,12 @@ jobs: -p gitUrlNoProtocol="git@github.com:${GITHUB_REPOSITORY_OWNER_PART_SLUG}" \ -p shortSha="${GITHUB_SHA_SHORT}" \ --wait --log - - run: echo "⭐️ the kubefirst open source platform is powered by github stars. give kubefirst one today https://github.com/kubefirst/kubefirst" + release: needs: staging runs-on: self-hosted steps: + - name: Setup Runner for Argo run: | cd $HOME @@ -134,12 +149,15 @@ jobs: sudo mv ./argo-linux-amd64 /usr/local/bin/argo # Test installation argo version --short + - name: Check out repository code uses: actions/checkout@v3 + - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 + # todo need to look repositoryGitURL, this needs to be overrideable from here and respected on the template side for both repositories - - name: release + - name: Deploy docs on production run: | echo "commit sha $GITHUB_SHA" argo version --short @@ -152,4 +170,3 @@ jobs: -p gitUrlNoProtocol="git@github.com:${GITHUB_REPOSITORY_OWNER_PART_SLUG}" \ -p shortSha="${GITHUB_SHA_SHORT}" \ --wait --log - - run: echo "⭐️ the kubefirst open source platform is powered by github stars. give kubefirst one today https://github.com/kubefirst/kubefirst" From db35f1abda354f0df45897b7b696c78056b558be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Mon, 10 Jul 2023 16:53:45 -0400 Subject: [PATCH 2/7] add retry number in chart file name let us rerun a failed workflow so we don't get an error that the name exist --- .github/workflows/publish.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f151ba2d..bb5d3a4b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,7 +9,7 @@ on: - main jobs: - publish: + chart: runs-on: self-hosted steps: @@ -33,16 +33,13 @@ jobs: - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 - - run: echo ${GITHUB_REPOSITORY} - - run: echo ${GITHUB_REPOSITORY_NAME_PART} - - run: echo ${GITHUB_SERVER_URL} - - name: Publish a new version of the docs + - name: Publish a new chart version of the docs run: | echo "commit sha ${GITHUB_SHA}" argo version --short argo submit .argo/publish.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p containerRegistryURL="${CONTAINER_REGISTRY_URL}/${GITHUB_REPOSITORY_NAME_PART}:${GITHUB_SHA_SHORT}" \ @@ -81,7 +78,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -121,7 +118,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -162,7 +159,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/release.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ From 1e7e19041db4b86e630c96caf2ec1b87fd3abae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Mon, 10 Jul 2023 16:55:09 -0400 Subject: [PATCH 3/7] let dispatch the release workflow manually --- .github/workflows/publish.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bb5d3a4b..3d575ec8 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -7,6 +7,7 @@ on: push: branches: - main + workflow_dispatch: jobs: chart: From 97d2520ebca79460387e034d29242bba82dd60f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Mon, 10 Jul 2023 17:15:52 -0400 Subject: [PATCH 4/7] give workflow a proper name --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 27a7fdc0..bccc1c11 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,4 +1,4 @@ -name: release +name: Release new docs env: ARGO_NAMESPACE: argo ARGO_VERSION: v3.4.1 From 138d21ed96194343e5bd4bf8eaae66fb12cc0962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Mon, 10 Jul 2023 17:17:30 -0400 Subject: [PATCH 5/7] fix run attempt variable --- .github/workflows/publish.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bccc1c11..b7a50a26 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -40,7 +40,7 @@ jobs: echo "commit sha ${GITHUB_SHA}" argo version --short argo submit .argo/publish.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p containerRegistryURL="${CONTAINER_REGISTRY_URL}/${GITHUB_REPOSITORY_NAME_PART}:${GITHUB_SHA_SHORT}" \ @@ -79,7 +79,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -119,7 +119,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -160,7 +160,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/release.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-{GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ From 134a644ec547f0c96ed7657a075481dc8e3f5d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Mon, 10 Jul 2023 17:31:10 -0400 Subject: [PATCH 6/7] fix github.run_attempt --- .github/workflows/publish.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index b7a50a26..f534f5fd 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -34,13 +34,17 @@ jobs: - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 + - run: echo ${GITHUB_REPOSITORY} + - run: echo ${GITHUB_REPOSITORY_NAME_PART} + - run: echo ${GITHUB_SERVER_URL} + - run: echo ${github.run_attempt} - name: Publish a new chart version of the docs run: | echo "commit sha ${GITHUB_SHA}" argo version --short argo submit .argo/publish.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p containerRegistryURL="${CONTAINER_REGISTRY_URL}/${GITHUB_REPOSITORY_NAME_PART}:${GITHUB_SHA_SHORT}" \ @@ -79,7 +83,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -119,7 +123,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -160,7 +164,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/release.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-${GITHUB.RUN_ATTEMPT}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ From 26e40260763c582c082008c8e4849d65200981d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Harper?= Date: Mon, 10 Jul 2023 17:33:36 -0400 Subject: [PATCH 7/7] wrong variable --- .github/workflows/publish.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f534f5fd..9cbdd32d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -37,14 +37,14 @@ jobs: - run: echo ${GITHUB_REPOSITORY} - run: echo ${GITHUB_REPOSITORY_NAME_PART} - run: echo ${GITHUB_SERVER_URL} - - run: echo ${github.run_attempt} + - run: echo ${GITHUB_RUN_ATTEMPT} - name: Publish a new chart version of the docs run: | echo "commit sha ${GITHUB_SHA}" argo version --short argo submit .argo/publish.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-publish-${GITHUB_SHA_SHORT}-${GITHUB_RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p containerRegistryURL="${CONTAINER_REGISTRY_URL}/${GITHUB_REPOSITORY_NAME_PART}:${GITHUB_SHA_SHORT}" \ @@ -83,7 +83,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-development-${GITHUB_SHA_SHORT}-${GITHUB_RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -123,7 +123,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/deploy.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-staging-${GITHUB_SHA_SHORT}-${GITHUB_RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \ @@ -164,7 +164,7 @@ jobs: echo "commit sha $GITHUB_SHA" argo version --short argo submit .argo/release.yaml \ - --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-${github.run_attempt}-" \ + --generate-name="${GITHUB_REPOSITORY_NAME_PART}-release-${GITHUB_SHA_SHORT}-${GITHUB_RUN_ATTEMPT}-" \ -p appName="${GITHUB_REPOSITORY_NAME_PART}" \ -p branch="${GITHUB_REF_NAME}" \ -p clusterName="mgmt-20-kubefirst-com" \