diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index 40b11f5..16c39d5 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -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## diff --git a/stx-vault-helm/centos/build_srpm.data b/stx-vault-helm/centos/build_srpm.data index 4ec735f..482e1a4 100644 --- a/stx-vault-helm/centos/build_srpm.data +++ b/stx-vault-helm/centos/build_srpm.data @@ -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" diff --git a/stx-vault-helm/centos/stx-vault-helm.spec b/stx-vault-helm/centos/stx-vault-helm.spec index 01c9bc1..9e8e496 100644 --- a/stx-vault-helm/centos/stx-vault-helm.spec +++ b/stx-vault-helm/centos/stx-vault-helm.spec @@ -20,7 +20,7 @@ Packager: Wind River 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="." & diff --git a/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/helmrelease.yaml b/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/helmrelease.yaml index 4b989f2..004ca16 100644 --- a/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/helmrelease.yaml +++ b/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/helmrelease.yaml @@ -15,7 +15,7 @@ spec: chart: spec: chart: vault - version: 0.6.0 + version: 0.19.0 sourceRef: kind: HelmRepository name: stx-platform diff --git a/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/vault-static-overrides.yaml b/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/vault-static-overrides.yaml index a63d01d..ae3d848 100644 --- a/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/vault-static-overrides.yaml +++ b/stx-vault-helm/stx-vault-helm/fluxcd-manifests/vault/vault-static-overrides.yaml @@ -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" diff --git a/vault-helm/centos/build_srpm.data b/vault-helm/centos/build_srpm.data index 5683174..b09b411 100644 --- a/vault-helm/centos/build_srpm.data +++ b/vault-helm/centos/build_srpm.data @@ -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" @@ -9,4 +9,4 @@ COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/$SRC_DIR/files/* $PKG_BASE/$SRC # Keep the SRCREV in sync with python-k8sapp-vault so the app version is # the same as the plugin version TIS_BASE_SRCREV=77715cf9146c04c401e6fdae51cd865953f82ef4 -TIS_PATCH_VER=GITREVCOUNT \ No newline at end of file +TIS_PATCH_VER=GITREVCOUNT diff --git a/vault-helm/centos/vault-helm.spec b/vault-helm/centos/vault-helm.spec index bb6cd2a..e4e6c09 100644 --- a/vault-helm/centos/vault-helm.spec +++ b/vault-helm/centos/vault-helm.spec @@ -20,7 +20,7 @@ Group: base Packager: Wind River 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 diff --git a/vault-helm/debian/deb_folder/patches/0001-Add-vault-manager-repository-to-values.yaml.patch b/vault-helm/debian/deb_folder/patches/0001-Add-vault-manager-repository-to-values.yaml.patch index c5b6eba..7d072f6 100644 --- a/vault-helm/debian/deb_folder/patches/0001-Add-vault-manager-repository-to-values.yaml.patch +++ b/vault-helm/debian/deb_folder/patches/0001-Add-vault-manager-repository-to-values.yaml.patch @@ -1,20 +1,19 @@ -From 48b0d72dffcef539823bb66f49d5da327611434f Mon Sep 17 00:00:00 2001 -From: Michel Thebeau -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 +Date: Sat, 5 Nov 2022 20:14:58 -0400 +Subject: [PATCH] Add vault manager repository to values.yaml -Signed-off-by: Michel Thebeau --- 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 diff --git a/vault-helm/debian/deb_folder/rules b/vault-helm/debian/deb_folder/rules index 38dc9d4..321d3cd 100755 --- a/vault-helm/debian/deb_folder/rules +++ b/vault-helm/debian/deb_folder/rules @@ -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 %: diff --git a/vault-helm/debian/meta_data.yaml b/vault-helm/debian/meta_data.yaml index a6066ba..f84ae45 100644 --- a/vault-helm/debian/meta_data.yaml +++ b/vault-helm/debian/meta_data.yaml @@ -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 diff --git a/vault-helm/vault-helm/files/0001-Add-vault-manager-repository-to-values.yaml.patch b/vault-helm/vault-helm/files/0001-Add-vault-manager-repository-to-values.yaml.patch index c5b6eba..7d072f6 100644 --- a/vault-helm/vault-helm/files/0001-Add-vault-manager-repository-to-values.yaml.patch +++ b/vault-helm/vault-helm/files/0001-Add-vault-manager-repository-to-values.yaml.patch @@ -1,20 +1,19 @@ -From 48b0d72dffcef539823bb66f49d5da327611434f Mon Sep 17 00:00:00 2001 -From: Michel Thebeau -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 +Date: Sat, 5 Nov 2022 20:14:58 -0400 +Subject: [PATCH] Add vault manager repository to values.yaml -Signed-off-by: Michel Thebeau --- 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