starlingx/vault-armada-app
Code Issues Proposed changes

Upversioning VAULT to v0.19.0 in order to support k8s v1.22 and higher.

Browse Source 
Story: 2010393
Task: 46786

https://github.com/hashicorp/vault-helm/releases/tag/v0.19.0
Vault image default 1.9.2
Vault K8s image default 0.14.2
Vault CSI Provider image default 0.4.0

Testing
- built vault application in Deb build environment
- on nov 6 nightly build
    * system application-upload ./vault-1.0-1.tgz
    * system application-apply vault
    * configured vault with
      https://docs.starlingx.io/security/kubernetes/configure-vault-using-the-cli.html
    * system application-remove vault
    * system application-delete vault



Signed-off-by: Greg Waines <greg.waines@windriver.com>
Change-Id: I75f4bdc93e3a8dc630f3ade45f53d150a3945f37
This commit is contained in:
Greg Waines 2022-11-07 19:05:53 -05:00
parent 94a9cd1022
commit 428454dc96
11 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
centos_tarball-dl.lst
View File

@ -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-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##

2
stx-vault-helm/centos/build_srpm.data
View File

@ -1,6 +1,6 @@
SRC_DIR="stx-vault-helm" 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 VERSION=1.0.0
TAR="$TAR_NAME.tar.gz" TAR="$TAR_NAME.tar.gz"

4
stx-vault-helm/centos/stx-vault-helm.spec
View File

@ -20,7 +20,7 @@ Packager: Wind River <info@windriver.com>
URL: unknown URL: unknown
# External helm chart source # 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 # psp-rolebinding source from stx/helm-charts/psp-rolebinding
# plugins source from stx/vault-armada-app/python-k8sapp-vault # plugins source from stx/vault-armada-app/python-k8sapp-vault
@ -37,7 +37,7 @@ BuildRequires: python-k8sapp-vault-wheels
StarlingX Vault FluxCD Helm Charts StarlingX Vault FluxCD Helm Charts
%prep %prep
%setup -n helm-charts-vault-0-6-0-1.0.0 %setup -n helm-charts-vault-0-19-0-1.0.0
%build %build
chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." & chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &

2
stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/helmrelease.yaml
View File

@ -15,7 +15,7 @@ spec:
chart: chart:
spec: spec:
chart: vault chart: vault
version: 0.6.0 version: 0.19.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: stx-platform name: stx-platform

10
stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/vault-static-overrides.yaml
View File

@ -26,10 +26,10 @@ injector:
node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/control-plane: ""
image: image:
repository: hashicorp/vault-k8s repository: hashicorp/vault-k8s
tag: 0.4.0 tag: 0.14.2
agentImage: agentImage:
repository: vault repository: hashicorp/vault
tag: 1.4.2 tag: 1.9.2
tolerations: | tolerations: |
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: "Exists" operator: "Exists"
@ -48,8 +48,8 @@ server:
component: server component: server
topologyKey: kubernetes.io/hostname topologyKey: kubernetes.io/hostname
image: image:
repository: vault repository: hashicorp/vault
tag: 1.4.2 tag: 1.9.2
tolerations: | tolerations: |
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: "Exists" operator: "Exists"

2
vault-helm/centos/build_srpm.data
View File

@ -1,6 +1,6 @@
SRC_DIR="vault-helm" SRC_DIR="vault-helm"
TAR_NAME=helm-charts-vault-0-6-0 TAR_NAME=helm-charts-vault-0-19-0
VERSION=1.0.0 VERSION=1.0.0
TAR="$TAR_NAME.tar.gz" TAR="$TAR_NAME.tar.gz"

2
vault-helm/centos/vault-helm.spec
View File

@ -20,7 +20,7 @@ Group: base
Packager: Wind River <info@windriver.com> Packager: Wind River <info@windriver.com>
URL: unknown URL: unknown
Source0: helm-charts-vault-0-6-0.tar.gz Source0: helm-charts-vault-0-19-0.tar.gz
Source1: repositories.yaml Source1: repositories.yaml
Source2: index.yaml Source2: index.yaml
Source3: Makefile Source3: Makefile

19
vault-helm/debian/deb_folder/patches/0001-Add-vault-manager-repository-to-values.yaml.patch
View File

@ -1,20 +1,19 @@
From 48b0d72dffcef539823bb66f49d5da327611434f Mon Sep 17 00:00:00 2001 From 2582b808e3fdeb33f47f69ff1fd024f8f42d794d Mon Sep 17 00:00:00 2001
From: Michel Thebeau <Michel.Thebeau@windriver.com> From: Greg Waines <greg.waines@windriver.com>
Date: Thu, 1 Apr 2021 18:12:49 -0400 Date: Sat, 5 Nov 2022 20:14:58 -0400
Subject: [PATCH] Add vault-manager repository to values.yaml Subject: [PATCH] Add vault manager repository to values.yaml
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
--- ---
values.yaml | 5 +++++ values.yaml | 5 +++++
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/values.yaml b/values.yaml diff --git a/values.yaml b/values.yaml
index 8c6e4a3..250c1a7 100644 index 61af7b2..76833e7 100644
--- a/values.yaml --- a/values.yaml
+++ b/values.yaml +++ b/values.yaml
@@ -13,6 +13,11 @@ global: @@ -24,6 +24,11 @@ global:
# Beta Feature: If deploying to OpenShift seccomp.security.alpha.kubernetes.io/defaultProfileName: runtime/default
openshift: false apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default
+manager: +manager:
+ image: + image:
@ -25,5 +24,5 @@ index 8c6e4a3..250c1a7 100644
# True if you want to enable vault agent injection. # True if you want to enable vault agent injection.
enabled: true enabled: true
-- --
2.29.2 2.34.1

2
vault-helm/debian/deb_folder/rules
View File

@ -4,7 +4,7 @@ export DH_VERBOSE = 1
export ROOT = debian/tmp export ROOT = debian/tmp
export APP_FOLDER = $(ROOT)/usr/lib/helm 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 export STAGING = staging
%: %:

6
vault-helm/debian/meta_data.yaml
View File

@ -2,9 +2,9 @@
debname: vault-helm debname: vault-helm
debver: 1.0-1 debver: 1.0-1
dl_path: dl_path:
name: helm-charts-vault-0-6-0.tar.gz name: helm-charts-vault-0-19-0.tar.gz
url: https://github.com/hashicorp/vault-helm/archive/v0.6.0.tar.gz url: https://github.com/hashicorp/vault-helm/archive/v0.19.0.tar.gz
md5sum: 534a999a2c31cd04e58632bacce3f589 md5sum: 49ac588b1a1ff4cd54bfa208983a4337
src_files: src_files:
- vault-helm/files/index.yaml - vault-helm/files/index.yaml
- vault-helm/files/Makefile - vault-helm/files/Makefile

19
vault-helm/vault-helm/files/0001-Add-vault-manager-repository-to-values.yaml.patch
View File

@ -1,20 +1,19 @@
From 48b0d72dffcef539823bb66f49d5da327611434f Mon Sep 17 00:00:00 2001 From 2582b808e3fdeb33f47f69ff1fd024f8f42d794d Mon Sep 17 00:00:00 2001
From: Michel Thebeau <Michel.Thebeau@windriver.com> From: Greg Waines <greg.waines@windriver.com>
Date: Thu, 1 Apr 2021 18:12:49 -0400 Date: Sat, 5 Nov 2022 20:14:58 -0400
Subject: [PATCH] Add vault-manager repository to values.yaml Subject: [PATCH] Add vault manager repository to values.yaml
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
--- ---
values.yaml | 5 +++++ values.yaml | 5 +++++
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/values.yaml b/values.yaml diff --git a/values.yaml b/values.yaml
index 8c6e4a3..250c1a7 100644 index 61af7b2..76833e7 100644
--- a/values.yaml --- a/values.yaml
+++ b/values.yaml +++ b/values.yaml
@@ -13,6 +13,11 @@ global: @@ -24,6 +24,11 @@ global:
# Beta Feature: If deploying to OpenShift seccomp.security.alpha.kubernetes.io/defaultProfileName: runtime/default
openshift: false apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default
+manager: +manager:
+ image: + image:
@ -25,5 +24,5 @@ index 8c6e4a3..250c1a7 100644
# True if you want to enable vault agent injection. # True if you want to enable vault agent injection.
enabled: true enabled: true
-- --
2.29.2 2.34.1