Skip to content

Commit 0fe470b

Browse files
catamtzcatamtz
authored
Merge branch 'main' into VAULT-48125
2 parents e942023 + 999a8e6 commit 0fe470b

11 files changed

Lines changed: 105 additions & 85 deletions

File tree

‎.github/actions/integration-test/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ runs:
5656
fi
5757
[ -n "${{ inputs.version }}" ] || (echo "inputs.version not set" >&2 ; exit 1)
5858
# Checkout this repo.
59-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
59+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6060
- name: Setup go
61-
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
61+
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
6262
with:
6363
go-version-file: .go-version
6464
- name: Create Kind Cluster

‎.github/workflows/build.yaml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
outputs:
2424
product-version: ${{ steps.get-product-version.outputs.product-version }}
2525
steps:
26-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
26+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2727
- name: get product version
2828
id: get-product-version
2929
run: |
@@ -37,9 +37,9 @@ jobs:
3737
outputs:
3838
go-version: ${{ steps.setup-go.outputs.go-version }}
3939
steps:
40-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
40+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4141
- id: setup-go
42-
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
42+
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
4343
with:
4444
go-version-file: .go-version
4545
- name: go mod download all
@@ -78,8 +78,8 @@ jobs:
7878
needs:
7979
- build-pre-checks
8080
steps:
81-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
82-
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
81+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
82+
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
8383
with:
8484
go-version-file: .go-version
8585
- run: make ci-test
@@ -101,7 +101,7 @@ jobs:
101101
filepath: ${{ steps.generate-metadata-file.outputs.filepath }}
102102
steps:
103103
- name: Checkout directory
104-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
104+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
105105
- name: Generate metadata file
106106
id: generate-metadata-file
107107
uses: hashicorp/actions-generate-metadata@v1
@@ -126,9 +126,9 @@ jobs:
126126
fail-fast: true
127127
steps:
128128
- name: Checkout
129-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
129+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
130130
- name: Setup go
131-
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
131+
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
132132
with:
133133
go-version-file: .go-version
134134
- name: Build binary
@@ -169,7 +169,7 @@ jobs:
169169
repo: ${{github.event.repository.name}}
170170
version: ${{needs.get-product-version.outputs.product-version}}
171171
steps:
172-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
172+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
173173
- name: Setup scripts directory
174174
shell: bash
175175
run: |
@@ -213,7 +213,7 @@ jobs:
213213
version: ${{needs.get-product-version.outputs.product-version}}
214214
image_tag: ${{needs.get-product-version.outputs.product-version}}-ubi
215215
steps:
216-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
216+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
217217
- name: Setup scripts directory
218218
shell: bash
219219
run: |
@@ -288,6 +288,7 @@ jobs:
288288
- "1.2.0"
289289
- "1.3.0"
290290
- "1.4.0"
291+
- "1.4.1"
291292
steps:
292293
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
293294
with:
@@ -309,9 +310,9 @@ jobs:
309310
shell: bash
310311
run: |
311312
helm repo add hashicorp https://helm.releases.hashicorp.com
312-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
313+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
313314
- name: Setup go
314-
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
315+
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
315316
with:
316317
go-version-file: .go-version
317318
- name: Run tests
@@ -362,9 +363,9 @@ jobs:
362363
shell: bash
363364
run: |
364365
helm repo add hashicorp https://helm.releases.hashicorp.com
365-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
366+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
366367
- name: Setup go
367-
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
368+
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
368369
with:
369370
go-version-file: .go-version
370371
- name: Run tests
@@ -388,7 +389,7 @@ jobs:
388389
installation-method: [helm, kustomize]
389390
vault-enterprise: [true, false]
390391
steps:
391-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
392+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
392393
- uses: ./.github/actions/integration-test
393394
name: vault:${{ matrix.vault-version }} kind:${{ matrix.k8s-version }}
394395
with:
@@ -425,7 +426,7 @@ jobs:
425426
installation-method: [kustomize]
426427
vault-enterprise: [true]
427428
steps:
428-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
429+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
429430
- uses: ./.github/actions/integration-test
430431
name: vault:${{ matrix.vault-version }} kind:${{ matrix.k8s-version }}
431432
with:

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.26.4
1+
1.26.5

‎.release/security-scan.hcl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ binary {
1919
// The required functionality was inadvertently dropped from
2020
// github.com/hashicorp/go-secure-stdlib/awsutil during the migration to aws-sdk-go-v2.
2121
"GO-2022-0635",
22+
// GO-2026-5932 flags the golang.org/x/crypto/openpgp subpackage as unmaintained/unsafe.
23+
// VSO does not import or call openpgp anywhere; confirmed via `go mod why` (package not
24+
// needed by the main module) and `govulncheck -mode=binary`, which found the symbol
25+
// unreachable in the built binary. False positive from module-level (non-symbol) matching.
26+
"GO-2026-5932",
2227
]
2328
}
2429
}

‎CHANGELOG.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
1-
## Unreleased
1+
## 1.5.0 (July 23rd, 2026)
22

3-
Breaking Changes:
3+
BREAKING CHANGES:
44
* `VaultAuth`/`VaultAuthGlobal` AppRole `spec.appRole.secretIDPath` has been removed. Use
55
`spec.appRole.secretRef` instead, which references a Kubernetes Secret containing the AppRole
66
Secret ID.
77

8+
Dependency Updates:
9+
* Bump the gomod-backward-compatible group across 1 directory with 2 updates: ([#1302](https://github.com/hashicorp/vault-secrets-operator/pull/1302))
10+
* Bump the gomod-backward-compatible group across 1 directory with 5 updates (#1308)
11+
* Bump github.com/go-openapi/runtime from 0.32.5 to 0.32.6 in the gomod-backward-compatible group ([#1310](https://github.com/hashicorp/vault-secrets-operator/pull/1310)
12+
* Bump google.golang.org/grpc from 1.82.0 to 1.82.1 ([#1311](https://github.com/hashicorp/vault-secrets-operator/pull/1311)
13+
* Bump google.golang.org/api from 0.289.0 to 0.290.0 in the gomod-backward-compatible group across 1 directory ([#1313](https://github.com/hashicorp/vault-secrets-operator/pull/1313)
14+
15+
Build:
16+
* Build with Go 1.26.5
17+
* Test with Vault 2.0.3, 1.21.8, 1.20.13, 1.19.19
18+
* Test with Kind v0.32.0
19+
* Test with K8s 1.36.1, 1.35.5, 1.34.8, 1.33.12, 1.32.11
20+
21+
822
## 1.4.1 (June 30th, 2026)
923

1024
Build:

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ BUNDLE_DIR ?= $(OPERATOR_BUILD_DIR)/bundle
2525
CHART_ROOT ?= chart
2626
CHART_CRDS_DIR ?= $(CHART_ROOT)/crds
2727

28-
VAULT_DOCS_VERSION ?= v1.21.x
28+
VAULT_DOCS_VERSION ?= v2.x
2929
VAULT_IMAGE_TAG ?= latest
3030
VAULT_IMAGE_REPO ?=
3131
K8S_VAULT_NAMESPACE ?= vault
32-
KIND_K8S_VERSION ?= v1.32.3
33-
VAULT_HELM_VERSION ?= 0.31.0
32+
KIND_K8S_VERSION ?= v1.36.1
33+
VAULT_HELM_VERSION ?= 0.34.0
3434
# Root directory to export kind cluster logs after each test run.
3535
EXPORT_KIND_LOGS_ROOT ?=
3636

‎chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
apiVersion: v2
55
name: vault-secrets-operator
6-
version: 1.4.1
7-
appVersion: "1.4.1"
6+
version: 1.5.0
7+
appVersion: "1.5.0"
88
kubeVersion: ">=1.21.0-0"
99
description: Official Vault Secrets Operator Chart
1010
type: application

‎chart/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ controller:
197197
image:
198198
pullPolicy: IfNotPresent
199199
repository: hashicorp/vault-secrets-operator
200-
tag: 1.4.1
200+
tag: 1.5.0
201201

202202
# logging
203203
logging:

‎config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ kind: Kustomization
1616
images:
1717
- name: controller
1818
newName: hashicorp/vault-secrets-operator
19-
newTag: 1.4.1
19+
newTag: 1.5.0

‎go.mod‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hashicorp/vault-secrets-operator
22

3-
go 1.26.4
3+
go 1.26.5
44

55
// k8s.io module versions must be kept in sync with each other, but
66
// indirect dependencies in the vault-secrets-operator module are
@@ -25,7 +25,7 @@ require (
2525
github.com/argoproj/argo-rollouts v1.8.3
2626
github.com/cenkalti/backoff/v4 v4.3.0
2727
github.com/go-logr/logr v1.4.4
28-
github.com/go-openapi/runtime v0.32.5
28+
github.com/go-openapi/runtime v0.32.6
2929
github.com/go-openapi/strfmt v0.27.0
3030
github.com/google/uuid v1.6.0
3131
github.com/gruntwork-io/terratest v1.0.1
@@ -44,7 +44,7 @@ require (
4444
github.com/prometheus/client_model v0.6.2
4545
github.com/stretchr/testify v1.11.1
4646
golang.org/x/crypto v0.54.0
47-
google.golang.org/api v0.289.0
47+
google.golang.org/api v0.290.0
4848
gopkg.in/yaml.v3 v3.0.1
4949
k8s.io/api v0.36.2
5050
k8s.io/apiextensions-apiserver v0.36.2
@@ -98,15 +98,15 @@ require (
9898
github.com/aws/smithy-go v1.27.1 // indirect
9999
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
100100
github.com/go-openapi/runtime/server-middleware v0.30.0 // indirect
101-
github.com/go-openapi/swag/conv v0.27.0 // indirect
102-
github.com/go-openapi/swag/fileutils v0.27.0 // indirect
103-
github.com/go-openapi/swag/jsonname v0.26.1 // indirect
104-
github.com/go-openapi/swag/jsonutils v0.27.0 // indirect
105-
github.com/go-openapi/swag/loading v0.26.1 // indirect
106-
github.com/go-openapi/swag/mangling v0.26.1 // indirect
107-
github.com/go-openapi/swag/stringutils v0.27.0 // indirect
108-
github.com/go-openapi/swag/typeutils v0.27.0 // indirect
109-
github.com/go-openapi/swag/yamlutils v0.26.1 // indirect
101+
github.com/go-openapi/swag/conv v0.27.3 // indirect
102+
github.com/go-openapi/swag/fileutils v0.27.3 // indirect
103+
github.com/go-openapi/swag/jsonutils v0.27.3 // indirect
104+
github.com/go-openapi/swag/loading v0.27.3 // indirect
105+
github.com/go-openapi/swag/mangling v0.27.3 // indirect
106+
github.com/go-openapi/swag/pools v0.27.3 // indirect
107+
github.com/go-openapi/swag/stringutils v0.27.3 // indirect
108+
github.com/go-openapi/swag/typeutils v0.27.3 // indirect
109+
github.com/go-openapi/swag/yamlutils v0.27.3 // indirect
110110
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
111111
github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
112112
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -148,14 +148,14 @@ require (
148148
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
149149
github.com/go-logr/stdr v1.2.2 // indirect
150150
github.com/go-logr/zapr v1.3.0 // indirect
151-
github.com/go-openapi/analysis v0.25.3 // indirect
151+
github.com/go-openapi/analysis v0.25.5 // indirect
152152
github.com/go-openapi/errors v0.22.8 // indirect
153-
github.com/go-openapi/jsonpointer v0.23.1 // indirect
154-
github.com/go-openapi/jsonreference v0.21.6 // indirect
155-
github.com/go-openapi/loads v0.24.0 // indirect
156-
github.com/go-openapi/spec v0.22.6 // indirect
153+
github.com/go-openapi/jsonpointer v1.0.0 // indirect
154+
github.com/go-openapi/jsonreference v1.0.0 // indirect
155+
github.com/go-openapi/loads v0.25.0 // indirect
156+
github.com/go-openapi/spec v0.22.9 // indirect
157157
github.com/go-openapi/swag v0.23.0 // indirect
158-
github.com/go-openapi/validate v0.26.0 // indirect
158+
github.com/go-openapi/validate v0.26.1 // indirect
159159
github.com/go-sql-driver/mysql v1.8.1 // indirect
160160
github.com/gogo/protobuf v1.3.2 // indirect
161161
github.com/google/gnostic-models v0.7.0 // indirect
@@ -230,7 +230,7 @@ require (
230230
golang.org/x/time v0.15.0 // indirect
231231
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
232232
google.golang.org/genproto/googleapis/rpc v0.0.0-20260706201446-f0a921348800 // indirect
233-
google.golang.org/grpc v1.82.0 // indirect
233+
google.golang.org/grpc v1.82.1 // indirect
234234
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
235235
gopkg.in/inf.v0 v0.9.1 // indirect
236236
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

0 commit comments

Comments
 (0)