Merge "Upversioning VAULT to v0.19.0 in order to support k8s v1.22 and higher."
This commit is contained in:
commit
03235cce70
@ -1 +1,2 @@
|
||||
helm-charts-vault-0-6-0.tar.gz#helm-charts-vault#https://github.com/hashicorp/vault-helm/archive/v0.6.0.tar.gz#http##
|
||||
helm-charts-vault-0-19-0.tar.gz#helm-charts-vault#https://github.com/hashicorp/vault-helm/archive/v0.19.0.tar.gz#http##
|
||||
|
@ -1,6 +1,6 @@
|
||||
SRC_DIR="stx-vault-helm"
|
||||
|
||||
TAR_NAME=helm-charts-vault-0-6-0
|
||||
TAR_NAME=helm-charts-vault-0-19-0
|
||||
VERSION=1.0.0
|
||||
TAR="$TAR_NAME.tar.gz"
|
||||
|
||||
|
@ -20,7 +20,7 @@ Packager: Wind River <info@windriver.com>
|
||||
URL: unknown
|
||||
|
||||
# External helm chart source
|
||||
Source0: helm-charts-vault-0-6-0.tar.gz
|
||||
Source0: helm-charts-vault-0-19-0.tar.gz
|
||||
|
||||
# psp-rolebinding source from stx/helm-charts/psp-rolebinding
|
||||
# plugins source from stx/vault-armada-app/python-k8sapp-vault
|
||||
@ -37,7 +37,7 @@ BuildRequires: python-k8sapp-vault-wheels
|
||||
StarlingX Vault FluxCD Helm Charts
|
||||
|
||||
%prep
|
||||
%setup -n helm-charts-vault-0-6-0-1.0.0
|
||||
%setup -n helm-charts-vault-0-19-0-1.0.0
|
||||
|
||||
%build
|
||||
chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
|
||||
|
@ -15,7 +15,7 @@ spec:
|
||||
chart:
|
||||
spec:
|
||||
chart: vault
|
||||
version: 0.6.0
|
||||
version: 0.19.0
|
||||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: stx-platform
|
||||
|
@ -26,10 +26,10 @@ injector:
|
||||
node-role.kubernetes.io/control-plane: ""
|
||||
image:
|
||||
repository: hashicorp/vault-k8s
|
||||
tag: 0.4.0
|
||||
tag: 0.14.2
|
||||
agentImage:
|
||||
repository: vault
|
||||
tag: 1.4.2
|
||||
repository: hashicorp/vault
|
||||
tag: 1.9.2
|
||||
tolerations: |
|
||||
- key: "node-role.kubernetes.io/master"
|
||||
operator: "Exists"
|
||||
@ -48,8 +48,8 @@ server:
|
||||
component: server
|
||||
topologyKey: kubernetes.io/hostname
|
||||
image:
|
||||
repository: vault
|
||||
tag: 1.4.2
|
||||
repository: hashicorp/vault
|
||||
tag: 1.9.2
|
||||
tolerations: |
|
||||
- key: "node-role.kubernetes.io/master"
|
||||
operator: "Exists"
|
||||
|
@ -1,6 +1,6 @@
|
||||
SRC_DIR="vault-helm"
|
||||
|
||||
TAR_NAME=helm-charts-vault-0-6-0
|
||||
TAR_NAME=helm-charts-vault-0-19-0
|
||||
VERSION=1.0.0
|
||||
TAR="$TAR_NAME.tar.gz"
|
||||
|
||||
|
@ -20,7 +20,7 @@ Group: base
|
||||
Packager: Wind River <info@windriver.com>
|
||||
URL: unknown
|
||||
|
||||
Source0: helm-charts-vault-0-6-0.tar.gz
|
||||
Source0: helm-charts-vault-0-19-0.tar.gz
|
||||
Source1: repositories.yaml
|
||||
Source2: index.yaml
|
||||
Source3: Makefile
|
||||
|
@ -1,20 +1,19 @@
|
||||
From 48b0d72dffcef539823bb66f49d5da327611434f Mon Sep 17 00:00:00 2001
|
||||
From: Michel Thebeau <Michel.Thebeau@windriver.com>
|
||||
Date: Thu, 1 Apr 2021 18:12:49 -0400
|
||||
Subject: [PATCH] Add vault-manager repository to values.yaml
|
||||
From 2582b808e3fdeb33f47f69ff1fd024f8f42d794d Mon Sep 17 00:00:00 2001
|
||||
From: Greg Waines <greg.waines@windriver.com>
|
||||
Date: Sat, 5 Nov 2022 20:14:58 -0400
|
||||
Subject: [PATCH] Add vault manager repository to values.yaml
|
||||
|
||||
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
|
||||
---
|
||||
values.yaml | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/values.yaml b/values.yaml
|
||||
index 8c6e4a3..250c1a7 100644
|
||||
index 61af7b2..76833e7 100644
|
||||
--- a/values.yaml
|
||||
+++ b/values.yaml
|
||||
@@ -13,6 +13,11 @@ global:
|
||||
# Beta Feature: If deploying to OpenShift
|
||||
openshift: false
|
||||
@@ -24,6 +24,11 @@ global:
|
||||
seccomp.security.alpha.kubernetes.io/defaultProfileName: runtime/default
|
||||
apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default
|
||||
|
||||
+manager:
|
||||
+ image:
|
||||
@ -25,5 +24,5 @@ index 8c6e4a3..250c1a7 100644
|
||||
# True if you want to enable vault agent injection.
|
||||
enabled: true
|
||||
--
|
||||
2.29.2
|
||||
2.34.1
|
||||
|
||||
|
@ -4,7 +4,7 @@ export DH_VERBOSE = 1
|
||||
export ROOT = debian/tmp
|
||||
export APP_FOLDER = $(ROOT)/usr/lib/helm
|
||||
|
||||
export APP_TARBALL = vault-0.6.0.tgz
|
||||
export APP_TARBALL = vault-0.19.0.tgz
|
||||
export STAGING = staging
|
||||
|
||||
%:
|
||||
|
@ -2,9 +2,9 @@
|
||||
debname: vault-helm
|
||||
debver: 1.0-1
|
||||
dl_path:
|
||||
name: helm-charts-vault-0-6-0.tar.gz
|
||||
url: https://github.com/hashicorp/vault-helm/archive/v0.6.0.tar.gz
|
||||
md5sum: 534a999a2c31cd04e58632bacce3f589
|
||||
name: helm-charts-vault-0-19-0.tar.gz
|
||||
url: https://github.com/hashicorp/vault-helm/archive/v0.19.0.tar.gz
|
||||
md5sum: 49ac588b1a1ff4cd54bfa208983a4337
|
||||
src_files:
|
||||
- vault-helm/files/index.yaml
|
||||
- vault-helm/files/Makefile
|
||||
|
@ -1,20 +1,19 @@
|
||||
From 48b0d72dffcef539823bb66f49d5da327611434f Mon Sep 17 00:00:00 2001
|
||||
From: Michel Thebeau <Michel.Thebeau@windriver.com>
|
||||
Date: Thu, 1 Apr 2021 18:12:49 -0400
|
||||
Subject: [PATCH] Add vault-manager repository to values.yaml
|
||||
From 2582b808e3fdeb33f47f69ff1fd024f8f42d794d Mon Sep 17 00:00:00 2001
|
||||
From: Greg Waines <greg.waines@windriver.com>
|
||||
Date: Sat, 5 Nov 2022 20:14:58 -0400
|
||||
Subject: [PATCH] Add vault manager repository to values.yaml
|
||||
|
||||
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
|
||||
---
|
||||
values.yaml | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/values.yaml b/values.yaml
|
||||
index 8c6e4a3..250c1a7 100644
|
||||
index 61af7b2..76833e7 100644
|
||||
--- a/values.yaml
|
||||
+++ b/values.yaml
|
||||
@@ -13,6 +13,11 @@ global:
|
||||
# Beta Feature: If deploying to OpenShift
|
||||
openshift: false
|
||||
@@ -24,6 +24,11 @@ global:
|
||||
seccomp.security.alpha.kubernetes.io/defaultProfileName: runtime/default
|
||||
apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default
|
||||
|
||||
+manager:
|
||||
+ image:
|
||||
@ -25,5 +24,5 @@ index 8c6e4a3..250c1a7 100644
|
||||
# True if you want to enable vault agent injection.
|
||||
enabled: true
|
||||
--
|
||||
2.29.2
|
||||
2.34.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user