From 9310738e44e5ca0c865151196848c075c641cf60 Mon Sep 17 00:00:00 2001
From: Rajesh <rjshrjndrn@gmail.com>
Date: Sat, 23 Nov 2019 08:28:01 +0000
Subject: [PATCH] fixes for dbs and helm
---
3node/helm-charts/apimanager/templates/apimanager_echo.yaml | 2 ++
3node/helm-charts/apimanager/templates/deployment.yaml | 2 ++
deploy/install.sh | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/3node/helm-charts/apimanager/templates/apimanager_echo.yaml b/3node/helm-charts/apimanager/templates/apimanager_echo.yaml
index 4fe82db79..6a7d51e6e 100644
--- a/3node/helm-charts/apimanager/templates/apimanager_echo.yaml
+++ b/3node/helm-charts/apimanager/templates/apimanager_echo.yaml
@@ -22,8 +22,10 @@ spec:
labels:
app: {{ .Chart.Name }}echo
spec:
+ {{- if .Values.imagePullSecrets }}
imagePullSecrets:
- name: {{ .Values.imagepullsecrets }}
+ {{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.dockerhub }}/{{ .Values.apimanagerecho.repository }}:{{ .Values.apimanagerecho.image_tag }}"
diff --git a/3node/helm-charts/apimanager/templates/deployment.yaml b/3node/helm-charts/apimanager/templates/deployment.yaml
index 7f351b2ca..35095601e 100755
--- a/3node/helm-charts/apimanager/templates/deployment.yaml
+++ b/3node/helm-charts/apimanager/templates/deployment.yaml
@@ -21,8 +21,10 @@ spec:
labels:
app: {{ .Chart.Name }}
spec:
+ {{- if .Values.imagePullSecrets }}
imagePullSecrets:
- name: {{ .Values.imagepullsecrets }}
+ {{- endif }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
diff --git a/deploy/install.sh b/deploy/install.sh
index 6f3bbf9f5..3469cf7a4 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -12,7 +12,7 @@ module=Core
cp $INVENTORY_PATH/$module/* ../ansible/inventory/env/
# Installing dbs (es, cassandra, postgres)
ansible-playbook -i ../ansible/inventory/env/ ../ansible/provision.yml --tags postgresql-master #--skip-tags "postgresql-slave,log-es"
-ansible-playbook -i ../ansible/inventory/env/ ../ansible/postgresql-data-update.yml --tags postgresql-master #--skip-tags "postgresql-slave,log-es"
+ansible-playbook -i ../ansible/inventory/env/ ../ansible/postgresql-data-update.yml #--skip-tags "postgresql-slave,log-es"
# # Bootstrapping k8s
ansible-playbook -i ../ansible/inventory/env/ ../kubernetes/ansible/bootstrap_minimal.yaml
--
GitLab