summaryrefslogtreecommitdiffstats
path: root/kubernetes/contrib/components/awx
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/contrib/components/awx')
-rw-r--r--kubernetes/contrib/components/awx/Makefile3
-rw-r--r--kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py2
-rw-r--r--kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh2
3 files changed, 6 insertions, 1 deletions
diff --git a/kubernetes/contrib/components/awx/Makefile b/kubernetes/contrib/components/awx/Makefile
index d8a50339d6..cb88b57fc9 100644
--- a/kubernetes/contrib/components/awx/Makefile
+++ b/kubernetes/contrib/components/awx/Makefile
@@ -11,6 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+HELM_BIN := helm
make-awx:
- cd charts && helm dep up awx-postgres
+ cd charts && $(HELM_BIN) dep up awx-postgres
diff --git a/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py b/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py
index 39350e05d0..85808d10d4 100644
--- a/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py
+++ b/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2019 Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+*/}}
DATABASES = {
'default': {
diff --git a/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh b/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh
index 7c58c6bb48..b9d01d079c 100644
--- a/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh
+++ b/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2019 Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+*/}}
DATABASE_USER={{ .Values.config.postgresUser }}
DATABASE_NAME={{ .Values.config.postgresDB }}