Skip to content

Commit 475822a

Browse files
csatib02csatib02
authored
Merge pull request #346 from bank-vaults/chore/prepare-release
chore: prepare release
2 parents f98859c + 15c08cd commit 475822a

File tree

5 files changed

+214
-236
lines changed

5 files changed

+214
-236
lines changed

‎.github/workflows/artifacts.yaml‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,24 @@ jobs:
124124
TAGS: ${{ steps.meta.outputs.tags }}
125125
run: |
126126
images=""
127-
for tag in ${TAGS}; do
127+
for tag in ${TAGS[@]}; do
128128
images+="${tag}@${DIGEST} "
129129
done
130-
131-
cosign sign --yes ${images}
130+
131+
cosign sign --yes --rekor-url "https://rekor.sigstore.dev/" ${images}
132+
133+
- name: Verify signed image with cosign
134+
if: ${{ inputs.publish && github.repository_owner == 'bank-vaults' }} # Check if the workflow is called by the same GitHub organization
135+
env:
136+
DIGEST: ${{ steps.build.outputs.digest }}
137+
TAGS: ${{ steps.meta.outputs.tags }}
138+
run: |
139+
for tag in ${TAGS[@]}; do
140+
cosign verify "${tag}@${DIGEST}" \
141+
--rekor-url "https://rekor.sigstore.dev/" \
142+
--certificate-identity "https://github.com/${{ github.repository }}/.github/workflows/artifacts.yaml@${{ github.ref }}" \
143+
--certificate-oidc-issuer "https://token.actions.githubusercontent.com" | jq
144+
done
132145
133146
- name: Set image ref
134147
id: image-ref
@@ -262,11 +275,30 @@ jobs:
262275
if: inputs.publish && inputs.release
263276

264277
- name: Helm push
265-
run: helm push ${{ steps.build.outputs.package }} oci://${{ steps.oci-registry-name.outputs.value }}
278+
id: push
279+
run: |
280+
helm push ${{ steps.build.outputs.package }} oci://${{ steps.oci-registry-name.outputs.value }} &> push-metadata.txt
281+
echo "digest=$(awk '/Digest: /{print $2}' push-metadata.txt)" >> "$GITHUB_OUTPUT"
266282
env:
267283
HELM_REGISTRY_CONFIG: ~/.docker/config.json
268284
if: inputs.publish && inputs.release
269285

286+
- name: Sign chart with GitHub OIDC Token
287+
if: ${{ inputs.publish && inputs.release && github.repository_owner == 'bank-vaults' }} # Check if the workflow is called by the same GitHub organization
288+
env:
289+
DIGEST: ${{ steps.push.outputs.digest }}
290+
run: cosign sign --yes --rekor-url "https://rekor.sigstore.dev/" "${{ steps.oci-chart-name.outputs.value }}@${DIGEST}"
291+
292+
- name: Verify signed chart with cosign
293+
if: ${{ inputs.publish && inputs.release && github.repository_owner == 'bank-vaults' }} # Check if the workflow is called by the same GitHub organization
294+
env:
295+
DIGEST: ${{ steps.push.outputs.digest }}
296+
run: |
297+
cosign verify "${{ steps.oci-chart-name.outputs.value }}@${DIGEST}" \
298+
--rekor-url "https://rekor.sigstore.dev/" \
299+
--certificate-identity "https://github.com/${{ github.repository }}/.github/workflows/artifacts.yaml@${{ github.ref }}" \
300+
--certificate-oidc-issuer "https://token.actions.githubusercontent.com" | jq
301+
270302
- name: Upload package as artifact
271303
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
272304
with:

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ jobs:
215215
strategy:
216216
matrix:
217217
k8s_version: ["v1.28.9", "v1.29.4", "v1.30.0"]
218-
operator_version: ["v1.22.1", "v1.22.2", "v1.22.3"] # First version that works with the generic webhook: v1.22.1
219-
webhook_version: ["v0.1.0", "v0.2.0"]
218+
operator_version: ["v1.22.2", "v1.22.3", "v1.22.4"] # First version that works with the generic webhook: v1.22.1
219+
webhook_version: ["v0.2.0", "v0.2.1"]
220220

221221
steps:
222222
- name: Checkout repository

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ deps: bin/golangci-lint bin/licensei bin/kind bin/helm bin/helm-docs
169169
deps: ## Install dependencies
170170

171171
# Dependency versions
172-
GOLANGCI_LINT_VERSION = 1.61.0
172+
GOLANGCI_LINT_VERSION = 1.62.2
173173
LICENSEI_VERSION = 0.9.0
174-
KIND_VERSION = 0.24.0
175-
HELM_VERSION = 3.16.1
174+
KIND_VERSION = 0.25.0
175+
HELM_VERSION = 3.16.3
176176
HELM_DOCS_VERSION = 1.14.2
177177

178178
# Dependency binaries

‎go.mod‎

Lines changed: 55 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,40 @@ module github.com/bank-vaults/vault-secrets-reloader
33
go 1.23.1
44

55
require (
6-
github.com/bank-vaults/secrets-webhook v0.2.0
7-
github.com/bank-vaults/vault-operator v1.22.3
8-
github.com/bank-vaults/vault-sdk v0.10.1
6+
github.com/bank-vaults/secrets-webhook v0.2.1
7+
github.com/bank-vaults/vault-operator v1.22.4
8+
github.com/bank-vaults/vault-sdk v0.10.2
99
github.com/hashicorp/vault/api v1.15.0
1010
github.com/samber/slog-multi v1.2.4
1111
github.com/stretchr/testify v1.10.0
12-
k8s.io/api v0.31.3
13-
k8s.io/apiextensions-apiserver v0.31.3
14-
k8s.io/apimachinery v0.31.3
15-
k8s.io/client-go v0.31.3
12+
k8s.io/api v0.32.0
13+
k8s.io/apiextensions-apiserver v0.32.0
14+
k8s.io/apimachinery v0.32.0
15+
k8s.io/client-go v0.32.0
1616
k8s.io/klog/v2 v2.130.1
1717
sigs.k8s.io/controller-runtime v0.19.3
1818
sigs.k8s.io/e2e-framework v0.5.0
1919
)
2020

2121
require (
22-
cloud.google.com/go/auth v0.9.4 // indirect
23-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
24-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
25-
cloud.google.com/go/iam v1.2.1 // indirect
22+
cloud.google.com/go/auth v0.12.1 // indirect
23+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
24+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
25+
cloud.google.com/go/iam v1.3.0 // indirect
2626
emperror.dev/errors v0.8.1 // indirect
27-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
27+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
2828
github.com/aws/aws-sdk-go v1.55.5 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
3131
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3232
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3333
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
34+
github.com/distribution/reference v0.6.0 // indirect
3435
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3536
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
36-
github.com/fatih/color v1.17.0 // indirect
37+
github.com/fatih/color v1.18.0 // indirect
3738
github.com/felixge/httpsnoop v1.0.4 // indirect
38-
github.com/fsnotify/fsnotify v1.7.0 // indirect
39+
github.com/fsnotify/fsnotify v1.8.0 // indirect
3940
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4041
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
4142
github.com/go-logr/logr v1.4.2 // indirect
@@ -44,16 +45,15 @@ require (
4445
github.com/go-openapi/jsonreference v0.21.0 // indirect
4546
github.com/go-openapi/swag v0.23.0 // indirect
4647
github.com/gogo/protobuf v1.3.2 // indirect
47-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4848
github.com/golang/protobuf v1.5.4 // indirect
49-
github.com/google/gnostic-models v0.6.8 // indirect
49+
github.com/google/gnostic-models v0.6.9 // indirect
5050
github.com/google/go-cmp v0.6.0 // indirect
5151
github.com/google/gofuzz v1.2.0 // indirect
5252
github.com/google/s2a-go v0.1.8 // indirect
5353
github.com/google/uuid v1.6.0 // indirect
5454
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
55-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
56-
github.com/gorilla/websocket v1.5.1 // indirect
55+
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
56+
github.com/gorilla/websocket v1.5.3 // indirect
5757
github.com/hashicorp/errwrap v1.1.0 // indirect
5858
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5959
github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -63,25 +63,26 @@ require (
6363
github.com/hashicorp/go-secure-stdlib/awsutil v0.3.0 // indirect
6464
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
6565
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
66-
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
66+
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
6767
github.com/hashicorp/go-uuid v1.0.3 // indirect
68-
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
68+
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
6969
github.com/hashicorp/vault/api/auth/aws v0.8.0 // indirect
7070
github.com/hashicorp/vault/api/auth/azure v0.7.0 // indirect
7171
github.com/hashicorp/vault/api/auth/gcp v0.8.0 // indirect
7272
github.com/hashicorp/vault/api/auth/kubernetes v0.8.0 // indirect
73-
github.com/imdario/mergo v0.3.16 // indirect
73+
github.com/imdario/mergo v1.0.1 // indirect
74+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7475
github.com/jmespath/go-jmespath v0.4.0 // indirect
7576
github.com/josharian/intern v1.0.0 // indirect
7677
github.com/json-iterator/go v1.1.12 // indirect
77-
github.com/klauspost/compress v1.17.10 // indirect
78-
github.com/magiconair/properties v1.8.7 // indirect
79-
github.com/mailru/easyjson v0.7.7 // indirect
78+
github.com/klauspost/compress v1.17.11 // indirect
79+
github.com/magiconair/properties v1.8.9 // indirect
80+
github.com/mailru/easyjson v0.9.0 // indirect
8081
github.com/mattn/go-colorable v0.1.13 // indirect
8182
github.com/mattn/go-isatty v0.0.20 // indirect
8283
github.com/mitchellh/go-homedir v1.1.0 // indirect
8384
github.com/mitchellh/mapstructure v1.5.0 // indirect
84-
github.com/moby/spdystream v0.4.0 // indirect
85+
github.com/moby/spdystream v0.5.0 // indirect
8586
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8687
github.com/modern-go/reflect2 v1.0.2 // indirect
8788
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -90,54 +91,57 @@ require (
9091
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
9192
github.com/pkg/errors v0.9.1 // indirect
9293
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
93-
github.com/prometheus/client_golang v1.20.4 // indirect
94+
github.com/prometheus/client_golang v1.20.5 // indirect
9495
github.com/prometheus/client_model v0.6.1 // indirect
95-
github.com/prometheus/common v0.59.1 // indirect
96+
github.com/prometheus/common v0.61.0 // indirect
9697
github.com/prometheus/procfs v0.15.1 // indirect
9798
github.com/ryanuber/go-glob v1.0.0 // indirect
98-
github.com/sagikazarmark/docker-ref v0.1.0 // indirect
99+
github.com/sagikazarmark/docker-ref v0.2.0 // indirect
99100
github.com/sagikazarmark/locafero v0.6.0 // indirect
100101
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
101102
github.com/samber/lo v1.47.0 // indirect
102103
github.com/sourcegraph/conc v0.3.0 // indirect
103104
github.com/spf13/afero v1.11.0 // indirect
104105
github.com/spf13/cast v1.7.0 // indirect
106+
github.com/spf13/cobra v1.8.1 // indirect
105107
github.com/spf13/pflag v1.0.5 // indirect
106108
github.com/spf13/viper v1.19.0 // indirect
107109
github.com/subosito/gotenv v1.6.0 // indirect
108-
github.com/vladimirvivien/gexe v0.3.0 // indirect
110+
github.com/vladimirvivien/gexe v0.4.1 // indirect
109111
github.com/x448/float16 v0.8.4 // indirect
110-
go.opencensus.io v0.24.0 // indirect
111-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
112-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
113-
go.opentelemetry.io/otel v1.30.0 // indirect
114-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
115-
go.opentelemetry.io/otel/trace v1.30.0 // indirect
112+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
113+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
114+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
115+
go.opentelemetry.io/otel v1.33.0 // indirect
116+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
117+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
116118
go.uber.org/multierr v1.11.0 // indirect
117119
golang.org/x/crypto v0.31.0 // indirect
118-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
119-
golang.org/x/net v0.29.0 // indirect
120-
golang.org/x/oauth2 v0.23.0 // indirect
120+
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
121+
golang.org/x/net v0.32.0 // indirect
122+
golang.org/x/oauth2 v0.24.0 // indirect
121123
golang.org/x/sync v0.10.0 // indirect
122124
golang.org/x/sys v0.28.0 // indirect
123125
golang.org/x/term v0.27.0 // indirect
124126
golang.org/x/text v0.21.0 // indirect
125-
golang.org/x/time v0.6.0 // indirect
127+
golang.org/x/time v0.8.0 // indirect
126128
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
127-
google.golang.org/api v0.198.0 // indirect
128-
google.golang.org/genproto v0.0.0-20240924160255-9d4c2d233b61 // indirect
129-
google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 // indirect
130-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect
131-
google.golang.org/grpc v1.67.0 // indirect
132-
google.golang.org/protobuf v1.34.2 // indirect
129+
google.golang.org/api v0.211.0 // indirect
130+
google.golang.org/genproto v0.0.0-20241209162323-e6fa225c2576 // indirect
131+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
133+
google.golang.org/grpc v1.69.0 // indirect
134+
google.golang.org/protobuf v1.35.2 // indirect
135+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
133136
gopkg.in/inf.v0 v0.9.1 // indirect
134137
gopkg.in/ini.v1 v1.67.0 // indirect
135-
gopkg.in/yaml.v2 v2.4.0 // indirect
136138
gopkg.in/yaml.v3 v3.0.1 // indirect
137-
k8s.io/component-base v0.31.3 // indirect
138-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
139-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
140-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
141-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
139+
k8s.io/component-base v0.32.0 // indirect
140+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
141+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
142+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
143+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
142144
sigs.k8s.io/yaml v1.4.0 // indirect
143145
)
146+
147+
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16

0 commit comments

Comments
 (0)