vault-manager: use image from values

The vault-manager does not pull its image from registry-local.

Add values to manifest and use them in vault-manager chart so that
armada will prepend registry-local to the image:tag.

Also edit the values.yaml in vault-helm tarball with the vault-manager's
repository and tag.

Closes-Bug: 1921008
Change-Id: If7a086c9dd10c3b5b961e0275be56bfb117e6a1d
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
This commit is contained in:
Michel Thebeau 2021-04-01 16:05:08 -04:00
parent b851751970
commit c85f980a6d
4 changed files with 38 additions and 1 deletions

View File

@ -56,6 +56,10 @@ data:
tlsDisable: false
imagePullSecrets:
- name: default-registry-key
manager:
image:
repository: starlingx/stx-vault-manager
tag: stx.5.0-v1.18.3
injector:
enabled: true
nodeSelector: |

View File

@ -31,6 +31,8 @@ Source7: _helpers-CA.tpl
BuildArch: noarch
Patch01: 0001-Add-vault-manager-repository-to-values.yaml.patch
BuildRequires: helm
BuildRequires: chartmuseum
@ -40,6 +42,8 @@ StarlingX Vault Helm Charts
%prep
%setup -n helm-charts-vault
%patch01 -p1
%build
chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
sleep 2

View File

@ -0,0 +1,29 @@
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
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
--- a/values.yaml
+++ b/values.yaml
@@ -13,6 +13,11 @@ global:
# Beta Feature: If deploying to OpenShift
openshift: false
+manager:
+ image:
+ repository: starlingx/stx-vault-manager
+ tag: stx.5.0-v1.18.3
+
injector:
# True if you want to enable vault agent injection.
enabled: true
--
2.29.2

View File

@ -201,7 +201,7 @@ spec:
{{- end }}
containers:
- name: manager
image: starlingx/stx-vault-manager:stx.5.0-v1.18.3
image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
imagePullPolicy: "{{ .Values.injector.image.pullPolicy }}"
args:
- bash