starlingx/upstream
Code Issues Proposed changes

Merge remote-tracking branch starlingx/master into HEAD

Browse Source 
Change-Id: Ic869bb108d7870fe73eb8c3ca13c4d602e39174d
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2019-02-13 12:41:36 -05:00
commit 1a1dddffe4
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/openstack-helm-infra/centos/openstack-helm-infra.spec
View File

@ -19,6 +19,7 @@ Patch01: 0001-gnocchi-chart-updates.patch
Patch02: Mariadb-Support-adoption-of-running-single-node-mari.patch
Patch03: 0004-Allow-multiple-containers-per-daemonset-pod.patch
Patch04: fix-type-error-to-streamline-single-replica-mariadb-.patch
Patch05: Add-imagePullSecrets-in-service-account.patch
BuildRequires: helm
@ -31,6 +32,7 @@ Openstack Helm Infra charts
%patch02 -p1
%patch03 -p1
%patch04 -p1
%patch05 -p1
%build
# initialize helm and build the toolkit

25
openstack/openstack-helm-infra/files/Add-imagePullSecrets-in-service-account.patch Normal file
View File

@ -0,0 +1,25 @@
From c432facb61964b1f5f3a0522083ef9e830697f4c Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Mon, 11 Feb 2019 11:29:03 -0500
Subject: [PATCH] Add imagePullSecrets in service account
---
helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
index b4cf1a6..2f4113b 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
@@ -44,6 +44,8 @@ kind: ServiceAccount
metadata:
name: {{ $saName }}
namespace: {{ $saNamespace }}
+imagePullSecrets:
+ - name: default-registry-key
{{- range $k, $v := $deps -}}
{{- if eq $k "services" }}
{{- range $serv := $v }}
--
1.8.3.1