Skip to content

Commit a9c8f90

Browse files
authored
Merge branch 'main' into dependabot/go_modules/helm.sh/helm/v3-3.16.4
2 parents ccb670c + d3f38ba commit a9c8f90

9 files changed

+90
-96
lines changed

.github/workflows/lint-code.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515
with:
1616
fetch-depth: 0
17-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
17+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #v5.2.0
1818
with:
1919
go-version-file: go.mod
2020
- name: Run golangci-lint

.github/workflows/lint-ghactions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818
- name: Ensure SHA pinned actions
19-
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@b35f285b9bb7e80de0967367cee66d3b6d50ceca # v3.0.1
19+
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@64418826697dcd77c93a8e4a1f7601a1942e57b5 # v3.0.18
2020
with:
2121
# slsa-github-generator requires using a semver tag for reusable workflows.
2222
# See: https://github.com/slsa-framework/slsa-github-generator#referencing-slsa-builders-and-generators

.github/workflows/lint-pullrequest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Validate PR title
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f
18+
- uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2121
with:

.github/workflows/publish-charts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
id-token: write # To sign the provenance.
7373
packages: write # To upload assets to release.
7474
actions: read # To read the workflow path.
75-
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v1.9.0
75+
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.0.0
7676
with:
7777
image: ghcr.io/${{ github.repository_owner }}/charts/capsule-addon-fluxcd
7878
digest: "${{ needs.publish-helm-oci.outputs.chart-digest }}"

.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: git fetch --prune --force --tags
2525

2626
- name: Setup Go
27-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
27+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #v5.2.0
2828
with:
2929
go-version-file: go.mod
3030
- run: go version
@@ -42,7 +42,7 @@ jobs:
4242
password: ${{ secrets.GITHUB_TOKEN }}
4343

4444
- name: Run GoReleaser
45-
uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
45+
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
4646
with:
4747
version: latest
4848
args: release --clean

.github/workflows/report-codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: make test
3232
- name: Upload Report to Codecov
3333
if: steps.checksecret.outputs.result == 'true'
34-
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
34+
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
3535
with:
3636
file: ./coverage.out
3737
fail_ci_if_error: true

.github/workflows/scan-code.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: Checkout Source
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
21+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #v5.2.0
2222
with:
2323
go-version-file: go.mod
2424
- name: Run Gosec Security Scanner

go.mod

+26-23
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
module github.com/projectcapsule/capsule-addon-flux
22

3-
go 1.23
3+
go 1.23.0
4+
5+
toolchain go1.23.4
46

57
require (
68
github.com/go-logr/logr v1.4.2
79
github.com/onsi/ginkgo/v2 v2.22.1
810
github.com/onsi/gomega v1.36.1
911
github.com/pkg/errors v0.9.1
10-
github.com/projectcapsule/capsule v0.7.1
12+
github.com/projectcapsule/capsule v0.7.2
1113
github.com/spf13/cobra v1.8.1
1214
go.uber.org/zap v1.27.0
13-
helm.sh/helm/v3 v3.16.4
14-
k8s.io/api v0.31.3
15-
k8s.io/apimachinery v0.31.3
16-
k8s.io/client-go v0.31.3
17-
sigs.k8s.io/controller-runtime v0.18.4
18-
sigs.k8s.io/kind v0.20.0
15+
helm.sh/helm/v3 v3.14.3
16+
k8s.io/api v0.32.0
17+
k8s.io/apimachinery v0.32.0
18+
k8s.io/client-go v0.32.0
19+
sigs.k8s.io/controller-runtime v0.19.3
20+
sigs.k8s.io/kind v0.26.0
1921
)
2022

2123
require (
2224
dario.cat/mergo v1.0.1 // indirect
2325
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
2426
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
25-
github.com/BurntSushi/toml v1.3.2 // indirect
27+
github.com/BurntSushi/toml v1.4.0 // indirect
2628
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2729
github.com/Masterminds/goutils v1.1.1 // indirect
2830
github.com/Masterminds/semver/v3 v3.3.0 // indirect
2931
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3032
github.com/Masterminds/squirrel v1.5.4 // indirect
31-
github.com/alessio/shellescape v1.4.1 // indirect
32-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
33+
github.com/Microsoft/hcsshim v0.11.4 // indirect
34+
github.com/alessio/shellescape v1.4.2 // indirect
35+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
3336
github.com/beorn7/perks v1.0.1 // indirect
3437
github.com/blang/semver/v4 v4.0.0 // indirect
3538
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -47,11 +50,12 @@ require (
4750
github.com/docker/docker-credential-helpers v0.7.0 // indirect
4851
github.com/docker/go-connections v0.5.0 // indirect
4952
github.com/docker/go-metrics v0.0.1 // indirect
50-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
51-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
53+
github.com/docker/go-units v0.5.0 // indirect
54+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
55+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
5256
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5357
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
54-
github.com/fatih/color v1.16.0 // indirect
58+
github.com/fatih/color v1.17.0 // indirect
5559
github.com/felixge/httpsnoop v1.0.4 // indirect
5660
github.com/fsnotify/fsnotify v1.7.0 // indirect
5761
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -65,7 +69,6 @@ require (
6569
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6670
github.com/gobwas/glob v0.2.3 // indirect
6771
github.com/gogo/protobuf v1.3.2 // indirect
68-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6972
github.com/golang/protobuf v1.5.4 // indirect
7073
github.com/google/btree v1.0.1 // indirect
7174
github.com/google/gnostic-models v0.6.8 // indirect
@@ -78,7 +81,7 @@ require (
7881
github.com/gorilla/mux v1.8.0 // indirect
7982
github.com/gorilla/websocket v1.5.0 // indirect
8083
github.com/gosuri/uitable v0.0.4 // indirect
81-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
84+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
8285
github.com/hashicorp/errwrap v1.1.0 // indirect
8386
github.com/hashicorp/go-multierror v1.1.1 // indirect
8487
github.com/huandu/xstrings v1.5.0 // indirect
@@ -100,7 +103,7 @@ require (
100103
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
101104
github.com/mitchellh/reflectwalk v1.0.2 // indirect
102105
github.com/moby/locker v1.0.1 // indirect
103-
github.com/moby/spdystream v0.4.0 // indirect
106+
github.com/moby/spdystream v0.5.0 // indirect
104107
github.com/moby/term v0.5.0 // indirect
105108
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
106109
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -111,7 +114,7 @@ require (
111114
github.com/opencontainers/image-spec v1.1.0 // indirect
112115
github.com/pelletier/go-toml v1.9.5 // indirect
113116
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
114-
github.com/prometheus/client_golang v1.20.1 // indirect
117+
github.com/prometheus/client_golang v1.20.5 // indirect
115118
github.com/prometheus/client_model v0.6.1 // indirect
116119
github.com/prometheus/common v0.55.0 // indirect
117120
github.com/prometheus/procfs v0.15.1 // indirect
@@ -134,19 +137,19 @@ require (
134137
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
135138
go.uber.org/multierr v1.11.0 // indirect
136139
golang.org/x/crypto v0.31.0 // indirect
137-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
140+
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
138141
golang.org/x/net v0.32.0 // indirect
139-
golang.org/x/oauth2 v0.21.0 // indirect
142+
golang.org/x/oauth2 v0.23.0 // indirect
140143
golang.org/x/sync v0.10.0 // indirect
141144
golang.org/x/sys v0.28.0 // indirect
142145
golang.org/x/term v0.27.0 // indirect
143146
golang.org/x/text v0.21.0 // indirect
144-
golang.org/x/time v0.5.0 // indirect
147+
golang.org/x/time v0.7.0 // indirect
145148
golang.org/x/tools v0.28.0 // indirect
146149
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
147150
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
148151
google.golang.org/grpc v1.65.0 // indirect
149-
google.golang.org/protobuf v1.34.2 // indirect
152+
google.golang.org/protobuf v1.35.1 // indirect
150153
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
151154
gopkg.in/inf.v0 v0.9.1 // indirect
152155
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -163,6 +166,6 @@ require (
163166
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
164167
sigs.k8s.io/kustomize/api v0.17.2 // indirect
165168
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
166-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
169+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
167170
sigs.k8s.io/yaml v1.4.0 // indirect
168171
)

0 commit comments

Comments
 (0)