Skip to content

Commit 2ba9ada

Browse files
trevorboxtrevorbox
committed
go 1.22
1 parent 083b9de commit 2ba9ada

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

‎.github/workflows/pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
RUN_UNIT_TESTS: true
1414
RUN_INTEGRATION_TESTS: true
1515
RUN_HELMCHART_TEST: true
16-
GO_VERSION: ~1.21
17-
OPERATOR_SDK_VERSION: v1.25.3
16+
GO_VERSION: ~1.22
17+
OPERATOR_SDK_VERSION: v1.31.0

‎.github/workflows/push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
RUN_UNIT_TESTS: true
2121
RUN_INTEGRATION_TESTS: true
2222
RUN_HELMCHART_TEST: true
23-
GO_VERSION: ~1.21
24-
OPERATOR_SDK_VERSION: v1.25.3
23+
GO_VERSION: ~1.22
24+
OPERATOR_SDK_VERSION: v1.31.0

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ KIND_VERSION ?= v0.27.0
66
KUBECTL_VERSION ?= v1.29.0
77
KUSTOMIZE_VERSION ?= v5.4.3
88
# Note changes to the vault version should also match image tags within the integration/vault-values.yaml and config/local-development/vault-values.yaml files
9-
VAULT_VERSION ?= 1.14.0
9+
VAULT_VERSION ?= 1.19.0
1010
# The vault version should also match the appVersion in the vault helm chart
11-
VAULT_CHART_VERSION ?= 0.25.0
11+
VAULT_CHART_VERSION ?= 0.30.0
1212
# Set the Operator SDK version to use. By default, what is installed on the system is used.
1313
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
1414
OPERATOR_SDK_VERSION ?= v1.31.0

‎Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ custom_build(
2626
local_resource(
2727
'vault-config-operator-manifests',
2828
'make manifests',
29-
deps=['./bin']
29+
deps=['./api']
3030
)
3131

3232
allow_k8s_contexts(k8s_context())

‎config/local-development/vault-values.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ injector:
99
enabled: false
1010
image:
1111
repository: "registry.connect.redhat.com/hashicorp/vault-k8s"
12-
tag: "1.4.2-ubi"
12+
tag: "1.6.2-ubi"
1313

1414
agentImage:
1515
repository: "registry.connect.redhat.com/hashicorp/vault"
16-
tag: "1.17.1-ubi"
16+
tag: "1.19.2-ubi"
1717

1818
csi:
1919
image:
@@ -23,7 +23,7 @@ csi:
2323

2424
server:
2525
image:
26-
tag: "1.17.1-ubi"
26+
tag: "1.19.2-ubi"
2727
repository: registry.connect.redhat.com/hashicorp/vault
2828

2929
extraEnvironmentVars:
@@ -108,7 +108,7 @@ server:
108108
extraContainers:
109109
# you should not do this in production
110110
- name: auto-initializer
111-
image: registry.connect.redhat.com/hashicorp/vault:1.17.1-ubi
111+
image: registry.connect.redhat.com/hashicorp/vault:1.19.2-ubi
112112
env:
113113
- name: NAMESPACE
114114
valueFrom:
@@ -145,7 +145,7 @@ server:
145145
mountPath: /usr/local/libexec/vault
146146
# you should not do this in production
147147
- name: auto-unsealer
148-
image: registry.connect.redhat.com/hashicorp/vault:1.17.1-ubi
148+
image: registry.connect.redhat.com/hashicorp/vault:1.19.2-ubi
149149
env:
150150
- name: VAULT_SKIP_VERIFY
151151
value: "true"
@@ -178,7 +178,7 @@ server:
178178
- name: vault-root-token
179179
mountPath: /vault-root-token
180180
- name: github-module-loader
181-
image: registry.connect.redhat.com/hashicorp/vault:1.17.1-ubi
181+
image: registry.connect.redhat.com/hashicorp/vault:1.19.2-ubi
182182
env:
183183
- name: VAULT_SKIP_VERIFY
184184
value: "true"

‎controllers/randomsecret_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ func (r *RandomSecretReconciler) manageReconcileLogic(context context.Context, i
157157
if instance.Status.LastVaultSecretUpdate == nil && instance.Spec.RefreshPeriod == nil {
158158
found, err := vaultEndpoint.Exists(context)
159159
if err != nil {
160-
r.Log.Error(err, "unable to verify secret existence", "instance", instance)
161-
// return err
160+
r.Log.Info("unable to verify secret existence", "instance", instance, "error", err)
162161
}
163162
if found {
164163
r.Log.Info("no refresh period is defined and Vault secret already exists - nothing to do", "name", instance.Name)

‎integration/vault-values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ server:
5858
extraContainers:
5959
# you should not do this in production
6060
- name: auto-initializer
61-
image: hashicorp/vault:1.14.0
61+
image: hashicorp/vault:1.19.0
6262
env:
6363
- name: VAULT_ADDR
6464
value: http://vault.vault.svc:8200
@@ -86,7 +86,7 @@ server:
8686
mountPath: /usr/local/libexec/vault
8787
# you should not do this in production
8888
- name: auto-unsealer
89-
image: hashicorp/vault:1.14.0
89+
image: hashicorp/vault:1.19.0
9090
env:
9191
- name: VAULT_ADDR
9292
value: http://vault.vault.svc:8200
@@ -115,7 +115,7 @@ server:
115115
- name: vault-root-token
116116
mountPath: /vault-root-token
117117
- name: github-module-loader
118-
image: hashicorp/vault:1.14.0
118+
image: hashicorp/vault:1.19.0
119119
env:
120120
- name: VAULT_ADDR
121121
value: http://vault.vault.svc:8200
@@ -148,7 +148,7 @@ server:
148148
- name: vault-root-token
149149
mountPath: /vault-root-token
150150
- name: vault-admin-initializer
151-
image: hashicorp/vault:1.14.0
151+
image: hashicorp/vault:1.19.0
152152
env:
153153
- name: VAULT_ADDR
154154
value: http://vault.vault.svc:8200

0 commit comments

Comments
 (0)