From a700326eb00ca8fefac9c02cc004593be588ea0a Mon Sep 17 00:00:00 2001 From: Michel Thebeau Date: Fri, 12 Jul 2024 18:56:58 +0000 Subject: [PATCH] change vault version to 1.14.0 Change the vault server version to match the chart's original content. The 1.14.8 version contains BUSL licenses, picked back as bug fixes from the non-opensource version of vault. Test Plan: PASS build and run the app PASS vault sanity Story: 2011073 Task: 50575 Change-Id: Ie4cad11c55b5515e098c302545a0ae62fd6ba4e2 Signed-off-by: Michel Thebeau --- ...dd-yaml-for-starlingx-image-handling.patch | 8 ++--- .../0001-Update-vault-version-to-1.14.8.patch | 30 ------------------- .../debian/deb_folder/patches/series | 1 - stx-vault-helm/debian/deb_folder/changelog | 5 ++++ stx-vault-helm/debian/meta_data.yaml | 2 +- .../vault/vault-static-overrides.yaml | 8 ++--- 6 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Update-vault-version-to-1.14.8.patch diff --git a/helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Add-yaml-for-starlingx-image-handling.patch b/helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Add-yaml-for-starlingx-image-handling.patch index 5525978..6c84180 100644 --- a/helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Add-yaml-for-starlingx-image-handling.patch +++ b/helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Add-yaml-for-starlingx-image-handling.patch @@ -1,14 +1,14 @@ From 9976bbbd382adeb321cc29c642781b3df55a72ac Mon Sep 17 00:00:00 2001 From: Sabyasachi Nayak Date: Fri, 5 Jan 2024 04:01:02 -0500 -Subject: [PATCH] Add yaml for starlingx image handling +Subject: [PATCH] Add yaml for Starlingx image handling -Add values yaml compatible with starlingx platform's image pull and +Add values yaml compatible with Starlingx platform's image pull and service parameter registry override handling. The platform will pull the image and populate registry.local, and the vault injector agent will pull from registry.local. -Signed-off-by: Sabyasachi Nayak +Signed-off-by: Michel Thebeau --- values.yaml | 3 +++ 1 file changed, 3 insertions(+) @@ -23,7 +23,7 @@ index 58eb8a2..a0c69c7 100644 agentImage: + image: + repository: "hashicorp/vault" -+ tag: "1.14.8" ++ tag: "1.14.0" repository: "hashicorp/vault" tag: "1.14.0" diff --git a/helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Update-vault-version-to-1.14.8.patch b/helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Update-vault-version-to-1.14.8.patch deleted file mode 100644 index 5f61a42..0000000 --- a/helm-charts/upstream/vault-helm/debian/deb_folder/patches/0001-Update-vault-version-to-1.14.8.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 77dfc57300718e71f342fa2bc804452ed3fae4be Mon Sep 17 00:00:00 2001 -From: Michel -Date: Fri, 5 Jan 2024 04:24:42 -0500 -Subject: [PATCH] Update vault version to 1.14.8 - -vault-helm chart application is using vault version 1.14.0. -There are 401 changes between vault v1.14.0 and v1.14.8 tags (https://github.com/hashicorp/vault): -80% are 'backport'', "cherry-pick" of commits - bug fixes. Updating to latest vault version. - -Signed-off-by: Sabyasachi Nayak ---- - Chart.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Chart.yaml b/Chart.yaml -index 104b05f..9c245fb 100644 ---- a/Chart.yaml -+++ b/Chart.yaml -@@ -4,7 +4,7 @@ - apiVersion: v2 - name: vault - version: 0.25.0 --appVersion: 1.14.0 -+appVersion: 1.14.8 - kubeVersion: ">= 1.20.0-0" - description: Official HashiCorp Vault Chart - home: https://www.vaultproject.io --- -2.25.1 - diff --git a/helm-charts/upstream/vault-helm/debian/deb_folder/patches/series b/helm-charts/upstream/vault-helm/debian/deb_folder/patches/series index 7f9ba07..f57c0b8 100644 --- a/helm-charts/upstream/vault-helm/debian/deb_folder/patches/series +++ b/helm-charts/upstream/vault-helm/debian/deb_folder/patches/series @@ -1,2 +1 @@ 0001-Add-yaml-for-starlingx-image-handling.patch -0001-Update-vault-version-to-1.14.8.patch diff --git a/stx-vault-helm/debian/deb_folder/changelog b/stx-vault-helm/debian/deb_folder/changelog index 5c01c2d..5ab3a81 100644 --- a/stx-vault-helm/debian/deb_folder/changelog +++ b/stx-vault-helm/debian/deb_folder/changelog @@ -1,3 +1,8 @@ +stx-vault-helm (1.0-2) unstable; urgency=medium + + * Update vault to 1.14.0, chart to 0.25.0 + + -- Michel Thebeau Fri, 12 Jul 2024 14:51:00 +0000 stx-vault-helm (1.0-1) unstable; urgency=medium * Initial release. diff --git a/stx-vault-helm/debian/meta_data.yaml b/stx-vault-helm/debian/meta_data.yaml index f64966c..ddea5d7 100644 --- a/stx-vault-helm/debian/meta_data.yaml +++ b/stx-vault-helm/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debname: stx-vault-helm -debver: 1.0-1 +debver: 1.0-2 src_path: stx-vault-helm revision: dist: $STX_DIST 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 a19ad5f..8268c4c 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 @@ -27,10 +27,10 @@ injector: # registry is assumed when omitted: image: repository: hashicorp/vault - tag: 1.14.8 + tag: 1.14.0 # Set the vault yaml to refer to registry.local pulled as above repository: registry.local:9001/docker.io/hashicorp/vault - tag: 1.14.8 + tag: 1.14.0 tolerations: | - key: "node-role.kubernetes.io/master" operator: "Exists" @@ -50,7 +50,7 @@ server: topologyKey: kubernetes.io/hostname image: repository: hashicorp/vault - tag: 1.14.8 + tag: 1.14.0 tolerations: | - key: "node-role.kubernetes.io/master" operator: "Exists" @@ -99,4 +99,4 @@ csi: agent: image: repository: "hashicorp/vault" - tag: "1.14.8" + tag: "1.14.0"