From 287b14933e25acd24f91b2a8efbbf0758d9f5711 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Tue, 15 May 2018 09:30:42 -0500 Subject: [PATCH] Update nfs-provisioner and ldap deployment scripts This updates the lma-nfs-provisioner deployment script to run make on the nfs-provisioner chart. Previously, it relied on the local image registry deployment step being run to lint and package the nfs-provisioner chart. This change allows the nfs-provisioner to be deployed without the local image registry if desired. This also updates the ldap deployment script to only run make on the ldap chart instead of pulling the default images with the make-pull directive Change-Id: I3d8f321d7a8af50fd80ffbd6a337fa17675f5700 --- tools/deployment/common/020-lma-nfs-provisioner.sh | 2 ++ tools/deployment/common/030-ldap.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/deployment/common/020-lma-nfs-provisioner.sh b/tools/deployment/common/020-lma-nfs-provisioner.sh index 55be5f35f2..c268089143 100755 --- a/tools/deployment/common/020-lma-nfs-provisioner.sh +++ b/tools/deployment/common/020-lma-nfs-provisioner.sh @@ -16,6 +16,8 @@ set -xe +make nfs-provisioner + #NOTE: Deploy nfs instance for logging, monitoring and alerting components tee /tmp/lma-nfs-provisioner.yaml << EOF labels: diff --git a/tools/deployment/common/030-ldap.sh b/tools/deployment/common/030-ldap.sh index e494060608..46946ae7bf 100755 --- a/tools/deployment/common/030-ldap.sh +++ b/tools/deployment/common/030-ldap.sh @@ -17,7 +17,7 @@ set -xe #NOTE: Pull images and lint chart -make pull-images ldap +make ldap #NOTE: Deploy command helm upgrade --install ldap ./ldap \