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 8f7ccf3..b4d4b21 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 @@ -28,7 +28,15 @@ injector: repository: hashicorp/vault-k8s tag: 0.14.2 agentImage: - repository: hashicorp/vault + # Add yaml compatible with starlingx platform image pull, and + # service-parameter registry overrides. This will pull from + # private or public registry into registry.local. docker.io + # registry is assumed when omitted: + image: + repository: hashicorp/vault + tag: 1.9.2 + # Set the vault yaml to refer to registry.local pulled as above + repository: registry.local:9001/docker.io/hashicorp/vault tag: 1.9.2 tolerations: | - key: "node-role.kubernetes.io/master" diff --git a/vault-helm/debian/deb_folder/patches/0001-Add-yaml-for-starlingx-image-handling.patch b/vault-helm/debian/deb_folder/patches/0001-Add-yaml-for-starlingx-image-handling.patch new file mode 100644 index 0000000..3c70897 --- /dev/null +++ b/vault-helm/debian/deb_folder/patches/0001-Add-yaml-for-starlingx-image-handling.patch @@ -0,0 +1,32 @@ +From 4df036228070727d83a370bf7c2d98e6cf7e1a48 Mon Sep 17 00:00:00 2001 +From: Michel Thebeau +Date: Tue, 2 May 2023 14:59:18 -0400 +Subject: [PATCH] Add yaml for starlingx image handling + +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: Michel Thebeau +--- + values.yaml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/values.yaml b/values.yaml +index aff058b..04e1e72 100644 +--- a/values.yaml ++++ b/values.yaml +@@ -93,6 +93,9 @@ injector: + # containers. This should be set to the official Vault image. Vault 1.3.1+ is + # required. + agentImage: ++ image: ++ repository: "hashicorp/vault" ++ tag: "1.9.2" + repository: "hashicorp/vault" + tag: "1.9.2" + +-- +2.25.1 + diff --git a/vault-helm/debian/deb_folder/patches/series b/vault-helm/debian/deb_folder/patches/series index cf8dcc3..68cfb85 100644 --- a/vault-helm/debian/deb_folder/patches/series +++ b/vault-helm/debian/deb_folder/patches/series @@ -1 +1,2 @@ 0001-Add-vault-manager-repository-to-values.yaml.patch +0001-Add-yaml-for-starlingx-image-handling.patch