diff --git a/openstack/openstack-helm-infra/centos/build_srpm.data b/openstack/openstack-helm-infra/centos/build_srpm.data index 0fbc4ee3..22d2fa85 100644 --- a/openstack/openstack-helm-infra/centos/build_srpm.data +++ b/openstack/openstack-helm-infra/centos/build_srpm.data @@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz" COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*" -TIS_PATCH_VER=6 +TIS_PATCH_VER=7 diff --git a/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec b/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec index 66e2aab0..4f9ca215 100644 --- a/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec +++ b/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec @@ -20,6 +20,7 @@ Patch02: Mariadb-Support-adoption-of-running-single-node-mari.patch Patch03: Mariadb-Share-container-PID-namespaces-under-docker.patch Patch04: 0004-Allow-multiple-containers-per-daemonset-pod.patch Patch05: fix-type-error-to-streamline-single-replica-mariadb-.patch +Patch06: Add-imagePullSecrets-in-service-account.patch BuildRequires: helm @@ -33,6 +34,7 @@ Openstack Helm Infra charts %patch03 -p1 %patch04 -p1 %patch05 -p1 +%patch06 -p1 %build # initialize helm and build the toolkit diff --git a/openstack/openstack-helm-infra/files/Add-imagePullSecrets-in-service-account.patch b/openstack/openstack-helm-infra/files/Add-imagePullSecrets-in-service-account.patch new file mode 100644 index 00000000..15e566d5 --- /dev/null +++ b/openstack/openstack-helm-infra/files/Add-imagePullSecrets-in-service-account.patch @@ -0,0 +1,25 @@ +From c432facb61964b1f5f3a0522083ef9e830697f4c Mon Sep 17 00:00:00 2001 +From: Angie Wang +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 +