Skip to content

Commit b2919ec

Browse files
Merge pull request #53 from jenkins-x-terraform/newbankvaults
fix: replace broken helm repository, upgrade bank-vault and vault
2 parents e4dfc2b + b80cb40 commit b2919ec

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

.lighthouse/jenkins-x/pullrequest.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@ spec:
1111
taskSpec:
1212
metadata: {}
1313
stepTemplate:
14-
image: uses:jenkins-x/jx3-pipeline-catalog/tasks/terraform/pullrequest.yaml@5d822bdd78d093c62ecce619b1552f2f34fd1a5a
14+
image: uses:jenkins-x/jx3-pipeline-catalog/tasks/terraform/pullrequest.yaml@versionStream
1515
resources:
1616
limits: {}
17+
requests: {}
1718
workingDir: /workspace/source
1819
steps:
1920
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
2021
name: ""
2122
- name: jx-variables
22-
resources: {}
23+
resources:
24+
requests:
25+
cpu: 400m
26+
memory: 600Mi
2327
- name: lint
2428
resources: {}
2529
podTemplate: {}

.lighthouse/jenkins-x/release.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@ spec:
1414
image: uses:jenkins-x/jx3-pipeline-catalog/tasks/terraform/release.yaml@versionStream
1515
resources:
1616
limits: {}
17+
requests: {}
1718
workingDir: /workspace/source
1819
steps:
1920
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone.yaml@versionStream
2021
name: ""
2122
- name: next-version
2223
resources: {}
2324
- name: jx-variables
24-
resources: {}
25+
resources:
26+
requests:
27+
cpu: 400m
28+
memory: 600Mi
2529
- name: lint
2630
resources: {}
2731
- name: changelog

terraform-jx-boot/vault.tf

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ resource "helm_release" "vault-operator" {
33
name = "vault-operator"
44
chart = "vault-operator"
55
namespace = "jx-vault"
6-
repository = "https://kubernetes-charts.banzaicloud.com"
7-
version = "1.14.3"
6+
repository = "oci://ghcr.io/bank-vaults/helm-charts"
7+
version = "1.22.3"
88
create_namespace = true
99
}
1010

@@ -14,6 +14,11 @@ resource "helm_release" "vault-instance" {
1414
chart = "vault-instance"
1515
namespace = "jx-vault"
1616
repository = "https://jenkins-x-charts.github.io/repo"
17-
version = "1.0.24"
17+
version = "1.0.28"
1818
depends_on = [helm_release.vault-operator]
19-
}
19+
20+
set {
21+
name = "bankVaultsImage"
22+
value = "ghcr.io/bank-vaults/bank-vaults:v1.31.2"
23+
}
24+
}

0 commit comments

Comments
 (0)