Skip to content

Commit 710df61

Browse files
authored
Upload support bundles as GH artifacts (#4621)
1 parent 9ada8ed commit 710df61

File tree

4 files changed

+36
-96
lines changed

4 files changed

+36
-96
lines changed
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
name: 'Generate Support Bundle'
22
description: 'Composite action for generating a support bundle'
33
inputs:
4-
aws-access-key-id:
5-
description: 'AWS access key id for uploading support bundle'
4+
artifact-name:
5+
description: 'Name of the artifact to be uploaded'
66
required: true
7-
aws-secret-access-key:
8-
description: 'AWS secret access key for uploading support bundle'
9-
required: true
10-
aws-region:
11-
description: 'AWS region for uploading support bundle'
12-
default: 'us-east-1'
13-
required: false
147
kots-namespace:
158
description: 'KOTS namespace'
169
required: true
1710
runs:
1811
using: "composite"
1912
steps:
20-
- name: Generate support bundle on failure
13+
- id: generate-support-bundle
2114
env:
22-
AWS_ACCESS_KEY_ID: ${{ inputs.aws-access-key-id }}
23-
AWS_SECRET_ACCESS_KEY: ${{ inputs.aws-secret-access-key }}
24-
AWS_DEFAULT_REGION: ${{ inputs.aws-region }}
2515
KOTS_NAMESPACE: ${{ inputs.kots-namespace }}
2616
run: |
2717
RELEASE="$(
@@ -33,6 +23,16 @@ runs:
3323
tar xzf support-bundle_linux_amd64.tar.gz
3424
./support-bundle https://kots.io
3525
BUNDLE="$(ls -1 | grep 'support-bundle-.*.tar.gz')"
36-
aws s3 cp "${BUNDLE}" "s3://kots-e2e-build-test-support-bundles/${BUNDLE}"
37-
echo "::notice ::support bundle uploaded to aws replicated-dev account s3://kots-e2e-build-test-support-bundles/${BUNDLE}"
26+
echo "bundle-name=$BUNDLE" >> "$GITHUB_OUTPUT"
27+
shell: bash
28+
29+
- id: upload-support-bundle
30+
uses: actions/upload-artifact@v4
31+
with:
32+
name: ${{ inputs.artifact-name }}
33+
path: ${{ steps.generate-support-bundle.outputs.bundle-name }}
34+
35+
- name: Print support bundle URL
3836
shell: bash
37+
run: |
38+
echo "::notice ::support bundle can be downloaded from: ${{ steps.upload-support-bundle.outputs.artifact-url }}"

.github/actions/kots-e2e/action.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ inputs:
6060
description: 'Run KOTS with the --airgap flag'
6161
default: "false"
6262
required: false
63-
aws-access-key-id:
64-
description: 'AWS access key id for uploading support bundle'
65-
required: false
66-
aws-secret-access-key:
67-
description: 'AWS secret access key for uploading support bundle'
68-
required: false
69-
aws-region:
70-
description: 'AWS region for uploading support bundle'
71-
default: 'us-east-1'
72-
required: false
7363
replicated-api-token:
7464
description: 'Replicated API token for C11y matrix'
7565
required: false
@@ -171,12 +161,10 @@ runs:
171161
shell: bash
172162

173163
- name: Generate support bundle on failure
174-
if: ${{ failure() && inputs.aws-access-key-id && inputs.aws-secret-access-key }}
164+
if: ${{ failure() }}
175165
uses: ./.github/actions/generate-support-bundle
176166
with:
177-
aws-access-key-id: ${{ inputs.aws-access-key-id }}
178-
aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
179-
aws-region: ${{ inputs.aws-region }}
167+
artifact-name: ${{ github.job }}-${{ inputs.k8s-distribution }}-${{ inputs.k8s-version }}-support-bundle
180168

181169
- name: Remove Cluster
182170
id: remove-cluster

0 commit comments

Comments
 (0)