fix Add pull secret for registry.local
Commit53ad52c956
did not address the issue. Instead, set the global value of imagePullSecrets in the manifest. Fix vault-init.yaml where imagePullSecrets had fallen into another section. Refrain from patching the vault tarball (revert the commit53ad52c9
) Closes-Bug: 1912696 Change-Id: Ia9e7cb52055ba9da342ea32f3c2bd3f24ce06630 Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
This commit is contained in:
parent
53ad52c956
commit
b851751970
|
@ -54,6 +54,8 @@ data:
|
||||||
global:
|
global:
|
||||||
enabled: true
|
enabled: true
|
||||||
tlsDisable: false
|
tlsDisable: false
|
||||||
|
imagePullSecrets:
|
||||||
|
- name: default-registry-key
|
||||||
injector:
|
injector:
|
||||||
enabled: true
|
enabled: true
|
||||||
nodeSelector: |
|
nodeSelector: |
|
||||||
|
@ -134,4 +136,4 @@ metadata:
|
||||||
data:
|
data:
|
||||||
release_prefix: sva
|
release_prefix: sva
|
||||||
chart_groups:
|
chart_groups:
|
||||||
- vault
|
- vault
|
||||||
|
|
|
@ -31,8 +31,6 @@ Source7: _helpers-CA.tpl
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
Patch01: 0001-add-image-pull-secrets-to-image.patch
|
|
||||||
|
|
||||||
BuildRequires: helm
|
BuildRequires: helm
|
||||||
BuildRequires: chartmuseum
|
BuildRequires: chartmuseum
|
||||||
|
|
||||||
|
@ -41,7 +39,6 @@ StarlingX Vault Helm Charts
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n helm-charts-vault
|
%setup -n helm-charts-vault
|
||||||
%patch01 -p1
|
|
||||||
|
|
||||||
%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="." &
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
From 40899d1d8dc374b85cfbffe6174c6b4dbfcdd040 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michel Thebeau <Michel.Thebeau@windriver.com>
|
|
||||||
Date: Tue, 26 Jan 2021 15:00:31 -0500
|
|
||||||
Subject: [PATCH] add image pull secrets to image
|
|
||||||
|
|
||||||
Signed-off-by: Michel Thebeau <Michel.Thebeau@windriver.com>
|
|
||||||
---
|
|
||||||
templates/injector-deployment.yaml | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/templates/injector-deployment.yaml b/templates/injector-deployment.yaml
|
|
||||||
index 8768f7d..e8cf060 100644
|
|
||||||
--- a/templates/injector-deployment.yaml
|
|
||||||
+++ b/templates/injector-deployment.yaml
|
|
||||||
@@ -40,6 +40,8 @@ spec:
|
|
||||||
containers:
|
|
||||||
- name: sidecar-injector
|
|
||||||
{{ template "injector.resources" . }}
|
|
||||||
+ imagePullSecrets:
|
|
||||||
+ - name: default-registry-key
|
|
||||||
image: "{{ .Values.injector.image.repository }}:{{ .Values.injector.image.tag }}"
|
|
||||||
imagePullPolicy: "{{ .Values.injector.image.pullPolicy }}"
|
|
||||||
env:
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
|
@ -195,6 +195,10 @@ spec:
|
||||||
component: webhook
|
component: webhook
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: "{{ template "vault.fullname" . }}"
|
serviceAccountName: "{{ template "vault.fullname" . }}"
|
||||||
|
{{- if .Values.global.imagePullSecrets }}
|
||||||
|
imagePullSecrets:
|
||||||
|
{{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: manager
|
- name: manager
|
||||||
image: starlingx/stx-vault-manager:stx.5.0-v1.18.3
|
image: starlingx/stx-vault-manager:stx.5.0-v1.18.3
|
||||||
|
@ -233,8 +237,4 @@ spec:
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Gi
|
storage: 1Gi
|
||||||
{{- if .Values.global.imagePullSecrets }}
|
{{ end }}
|
||||||
imagePullSecrets:
|
|
||||||
{{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
|
|
||||||
{{- end }}
|
|
||||||
{{ end }}
|
|
||||||
|
|
Loading…
Reference in New Issue