Skip to content

Commit 72c3482

Browse files
authored
Merge branch 'main' into image-v5
2 parents 1def211 + c76b0ab commit 72c3482

File tree

3 files changed

+11
-26
lines changed

3 files changed

+11
-26
lines changed

.github/workflows/regression-test.yaml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,10 @@ jobs:
2929
run: mkdir -p test/output
3030

3131
- name: Create k3s cluster
32-
id: create-cluster
33-
uses: replicatedhq/compatibility-actions/create-cluster@v1
32+
id: k3s
33+
uses: replicatedhq/action-k3s@main
3434
with:
35-
api-token: ${{ secrets.REPLICATED_API_TOKEN }}
36-
kubernetes-distribution: k3s
37-
cluster-name: regression-${{ github.run_id }}-${{ github.run_attempt }}
38-
ttl: 25m
39-
timeout-minutes: 5
40-
41-
- name: Configure kubeconfig
42-
run: |
43-
echo "${{ steps.create-cluster.outputs.cluster-kubeconfig }}" > $GITHUB_WORKSPACE/kubeconfig.yaml
44-
echo "KUBECONFIG=$GITHUB_WORKSPACE/kubeconfig.yaml" >> $GITHUB_ENV
35+
version: v1.31.2-k3s1
4536

4637
- name: Verify cluster access
4738
run: kubectl get nodes -o wide
@@ -284,10 +275,4 @@ jobs:
284275
git push
285276
286277
# 6. CLEANUP
287-
- name: Remove cluster
288-
if: always()
289-
uses: replicatedhq/compatibility-actions/remove-cluster@v1
290-
continue-on-error: true
291-
with:
292-
api-token: ${{ secrets.REPLICATED_API_TOKEN }}
293-
cluster-id: ${{ steps.create-cluster.outputs.cluster-id }}
278+
# Note: k3s cluster cleanup is handled automatically by the action

examples/sdk/helm-template/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module helm-template
22

3-
go 1.24.6
3+
go 1.25.4
44

55
// Always use the local version of troubleshoot so as to build using
66
// the latest version of the library. This will ensure the example
@@ -9,7 +9,7 @@ replace github.com/replicatedhq/troubleshoot v0.0.0 => ../../../
99

1010
require (
1111
github.com/replicatedhq/troubleshoot v0.0.0
12-
helm.sh/helm/v3 v3.19.0
12+
helm.sh/helm/v3 v3.19.2
1313
sigs.k8s.io/yaml v1.6.0
1414
)
1515

@@ -19,7 +19,7 @@ require (
1919
github.com/Masterminds/goutils v1.1.1 // indirect
2020
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2121
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
22-
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
22+
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
2323
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2424
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2525
github.com/fxamacker/cbor/v2 v2.9.0 // indirect

examples/sdk/helm-template/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
1010
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
1111
github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
1212
github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
13-
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
14-
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
13+
github.com/cyphar/filepath-securejoin v0.6.0 h1:BtGB77njd6SVO6VztOHfPxKitJvd/VPT+OFBFMOi1Is=
14+
github.com/cyphar/filepath-securejoin v0.6.0/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
1515
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1616
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1717
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -162,8 +162,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
162162
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
163163
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
164164
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
165-
helm.sh/helm/v3 v3.19.0 h1:krVyCGa8fa/wzTZgqw0DUiXuRT5BPdeqE/sQXujQ22k=
166-
helm.sh/helm/v3 v3.19.0/go.mod h1:Lk/SfzN0w3a3C3o+TdAKrLwJ0wcZ//t1/SDXAvfgDdc=
165+
helm.sh/helm/v3 v3.19.2 h1:psQjaM8aIWrSVEly6PgYtLu/y6MRSmok4ERiGhZmtUY=
166+
helm.sh/helm/v3 v3.19.2/go.mod h1:gX10tB5ErM+8fr7bglUUS/UfTOO8UUTYWIBH1IYNnpE=
167167
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
168168
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
169169
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=

0 commit comments

Comments
 (0)