From f5c0f6f0ae97bdddf86ae1d663a9a7c3ed1bfe94 Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Fri, 14 Jun 2024 20:04:01 -0400 Subject: [PATCH 1/7] updated github template names --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 320367c2..31a67e12 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,6 +1,6 @@ --- name: Bug Report -about: Create a report to help us improve! +about: Submit a bug report to help us improve! title: '[BUG]' labels: 'bug' assignees: '' diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 9d6f7a12..8b11921b 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,6 +1,6 @@ --- name: Feature Request -about: Submit a request for us to improve! +about: Submit a feature request for us to improve! title: '[RFE]' labels: 'enhancement' assignees: '' From 35e2f655da71faef12d03469e439de588d8e0a9a Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Fri, 14 Jun 2024 20:37:58 -0400 Subject: [PATCH 2/7] added helm chart release job --- .github/workflows/release.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3a7cb78b..02e1fd7d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -62,3 +62,31 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: ghcr.io/${{ github.repository }}:${{ github.ref_name }} + + chart-release: + name: Chart Release Job + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Authenticate to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Set Up Helm + uses: azure/setup-helm@v4 + + - name: Build Helm Chart + run: | + helm package deploy/kubernetes/helm/charts/hauler --destination deploy/kubernetes/helm/charts/hauler + + - name: Push to GitHub Container Registry + run: | + helm push deploy/kubernetes/helm/charts/hauler/hauler-*.tgz oci://ghcr.io/${{ github.repository_owner }}/charts From 9058797bbc07464d4ddb4b65765233d98bf314bf Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Fri, 14 Jun 2024 20:42:50 -0400 Subject: [PATCH 3/7] updated goreleaser deprecations --- .github/workflows/release.yaml | 2 +- .goreleaser.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 02e1fd7d..a0f24288 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,7 +23,7 @@ jobs: go-version: 1.21.x - name: Run Go Releaser - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser version: latest diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a88d3d28..e8736ce2 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -36,14 +36,14 @@ universal_binaries: - replace: false changelog: - skip: false + disable: false use: git brews: - name: hauler - tap: + repository: owner: rancherfederal name: homebrew-tap token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}" - folder: Formula + directory: Formula description: "Hauler CLI" From 22edc77506a05c30403660afc7e152c68026e8c9 Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Fri, 14 Jun 2024 20:56:37 -0400 Subject: [PATCH 4/7] updated unit test workflow --- .github/workflows/unittest.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml index 663758e4..5ff9c54d 100644 --- a/.github/workflows/unittest.yaml +++ b/.github/workflows/unittest.yaml @@ -29,9 +29,10 @@ jobs: run: | mkdir -p cmd/hauler/binaries touch cmd/hauler/binaries/dummy.txt - go test -race -covermode=atomic -coverprofile=coverage.out ./pkg/... ./internal/... ./cmd/... + go test -race -covermode=atomic -coverprofile=coverage.out ./... - - name: On Failure, Launch Debug Session - if: ${{ failure() }} - uses: mxschmitt/action-tmate@v3 - timeout-minutes: 10 + - name: Upload Coverage Report + uses: actions/upload-artifact@v4 + with: + name: coverage-report + path: coverage.out From 385d767c2a4b135161f0905ad8b38dd9c77b903b Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Mon, 17 Jun 2024 19:42:20 -0400 Subject: [PATCH 5/7] last bit of fixes to workflow --- .github/workflows/release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a0f24288..3df03697 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -36,6 +36,7 @@ jobs: name: Container Release Job runs-on: ubuntu-latest timeout-minutes: 30 + continue-on-error: true steps: - name: Checkout uses: actions/checkout@v4 @@ -48,7 +49,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to GitHub Container Registry + - name: Authenticate to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io @@ -67,6 +68,7 @@ jobs: name: Chart Release Job runs-on: ubuntu-latest timeout-minutes: 30 + continue-on-error: true steps: - name: Checkout uses: actions/checkout@v4 @@ -77,7 +79,7 @@ jobs: uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.actor }} + username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Set Up Helm From bef141ab67eb2223f06eb3aa24a4d0d59421c212 Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Mon, 17 Jun 2024 19:45:18 -0400 Subject: [PATCH 6/7] updated chart versions (will need to update again) --- deploy/kubernetes/helm/charts/hauler/Chart.yaml | 4 ++-- deploy/kubernetes/helm/charts/hauler/README.md | 2 +- deploy/kubernetes/helm/charts/hauler/app-readme.md | 2 +- deploy/kubernetes/helm/charts/hauler/values.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/kubernetes/helm/charts/hauler/Chart.yaml b/deploy/kubernetes/helm/charts/hauler/Chart.yaml index 53307031..141e975d 100644 --- a/deploy/kubernetes/helm/charts/hauler/Chart.yaml +++ b/deploy/kubernetes/helm/charts/hauler/Chart.yaml @@ -3,5 +3,5 @@ name: hauler description: Hauler Helm Chart - Airgap Swiss Army Knife icon: https://raw.githubusercontent.com/rancherfederal/hauler/main/static/rgs-hauler-logo-icon.svg type: application -version: 0.1.0 -appVersion: 1.0.2 +version: 1.0.3 +appVersion: 1.0.3 diff --git a/deploy/kubernetes/helm/charts/hauler/README.md b/deploy/kubernetes/helm/charts/hauler/README.md index 4c42357d..e5e5fa74 100644 --- a/deploy/kubernetes/helm/charts/hauler/README.md +++ b/deploy/kubernetes/helm/charts/hauler/README.md @@ -14,7 +14,7 @@ | Type | Chart Version | App Version | | ----------- | ------------- | ----------- | -| application | `0.1.0` | `1.0.2` | +| application | `1.0.3` | `1.0.3` | ## Installing the Chart diff --git a/deploy/kubernetes/helm/charts/hauler/app-readme.md b/deploy/kubernetes/helm/charts/hauler/app-readme.md index 4c42357d..e5e5fa74 100644 --- a/deploy/kubernetes/helm/charts/hauler/app-readme.md +++ b/deploy/kubernetes/helm/charts/hauler/app-readme.md @@ -14,7 +14,7 @@ | Type | Chart Version | App Version | | ----------- | ------------- | ----------- | -| application | `0.1.0` | `1.0.2` | +| application | `1.0.3` | `1.0.3` | ## Installing the Chart diff --git a/deploy/kubernetes/helm/charts/hauler/values.yaml b/deploy/kubernetes/helm/charts/hauler/values.yaml index 7dac320e..1365643a 100644 --- a/deploy/kubernetes/helm/charts/hauler/values.yaml +++ b/deploy/kubernetes/helm/charts/hauler/values.yaml @@ -4,7 +4,7 @@ hauler: image: repository: ghcr.io/rancherfederal/hauler - tag: v1.0.2 + tag: v1.0.3 imagePullPolicy: Always initContainers: From d90545a9e4bf68aa325d019bac55129f2eed3c41 Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Mon, 17 Jun 2024 22:15:38 -0400 Subject: [PATCH 7/7] fixed permissions on testdata --- testdata/haul.tar.zst | Bin testdata/hauler-manifest.yaml | 0 testdata/rancher-cluster-templates-0.4.4.tgz | Bin 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 testdata/haul.tar.zst mode change 100644 => 100755 testdata/hauler-manifest.yaml mode change 100644 => 100755 testdata/rancher-cluster-templates-0.4.4.tgz diff --git a/testdata/haul.tar.zst b/testdata/haul.tar.zst old mode 100644 new mode 100755 diff --git a/testdata/hauler-manifest.yaml b/testdata/hauler-manifest.yaml old mode 100644 new mode 100755 diff --git a/testdata/rancher-cluster-templates-0.4.4.tgz b/testdata/rancher-cluster-templates-0.4.4.tgz old mode 100644 new mode 100755