Add override to helm chart

Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I912f51e3dc145830c9554a0e88719b330fc3e18f

diff --git a/README-o2imsbuilder.md b/README-o2imsbuilder.md
index e19b759..a2b4816 100644 (file)
--- a/README-o2imsbuilder.md
+++ b/README-o2imsbuilder.md
@@ -53,7 +53,24 @@ sudo docker tag o2imsdms:latest registry.local:9001/admin/o2imsdms:0.1.1
 sudo docker image push registry.local:9001/admin/o2imsdms:0.1.1\r
 \r
 cd /home/sysadmin/share/o2\r
-helm install o2imstest charts\r
+\r
+cat <<EOF>ocloud-override.yaml\r
+o2ims:\r
+  imagePullSecrets: admin-orano2-registry-secret\r
+  image:\r
+    repository: registry.local:9001/admin/o2imsdms\r
+    tag: 0.1.1\r
+    pullPolicy: IfNotPresent\r
+  logginglevel: "DEBUG"\r
+\r
+ocloud:\r
+  OS_AUTH_URL: "your O-Cloud Auth endpoint, e.g. http://1.2.3.4:5000/v3"\r
+  OS_USERNAME: "Your auth Username"\r
+  OS_PASSWORD: "Your auth Password"\r
+EOF\r
+\r
+helm install o2imstest charts/ -f ocloud-override.yaml\r
+\r
 kubectl -n ${NAMESPACE} get pods\r
 \r
 \r

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index 2e8ebf1..7748f3e 100644 (file)
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -64,9 +64,9 @@ spec:
             - name: FLASK_APP\r
               value: /root/o2/o2ims/entrypoints/flask_application.py\r
             - name: FLASK_DEBUG\r
-              value: "1"\r
+              value: {{ .Values.o2ims.logginglevel }}\r
             - name: LOGGING_CONFIG_LEVEL\r
-              value: DEBUG\r
+              value: {{ .Values.o2ims.logginglevel }}\r
             - name: OS_AUTH_URL\r
             - name: OS_PASSWORD\r
             - name: OS_USERNAME\r
@@ -93,10 +93,13 @@ spec:
             - name: DB_PASSWORD\r
               value: o2ims123\r
             - name: LOGGING_CONFIG_LEVEL\r
-              value: DEBUG\r
+              value: {{ .Values.o2ims.logginglevel }}\r
             - name: OS_AUTH_URL\r
+              value: {{ .Values.ocloud.OS_AUTH_URL }}\r
             - name: OS_PASSWORD\r
+              value: {{ .Values.ocloud.OS_PASSWORD }}\r
             - name: OS_USERNAME\r
+              value: {{ .Values.ocloud.OS_USERNAME }}\r
             - name: PYTHONDONTWRITEBYTECODE\r
               value: "1"\r
             - name: REDIS_HOST\r
@@ -113,10 +116,13 @@ spec:
             - name: DB_PASSWORD\r
               value: o2ims123\r
             - name: LOGGING_CONFIG_LEVEL\r
-              value: DEBUG\r
+              value: {{ .Values.o2ims.logginglevel }}\r
             - name: OS_AUTH_URL\r
+              value: {{ .Values.ocloud.OS_AUTH_URL }}\r
             - name: OS_PASSWORD\r
+              value: {{ .Values.ocloud.OS_PASSWORD }}\r
             - name: OS_USERNAME\r
+              value: {{ .Values.ocloud.OS_USERNAME }}\r
             - name: PYTHONDONTWRITEBYTECODE\r
               value: "1"\r
             - name: REDIS_HOST\r

diff --git a/charts/values.yaml b/charts/values.yaml
index 2772908..1008681 100644 (file)
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -35,3 +35,9 @@ o2ims:
     repository: registry.local:9001/admin/o2imsdms
     tag: 0.1.1
     pullPolicy: IfNotPresent
+  logginglevel: "WARNING"
+
+ocloud:
+  OS_AUTH_URL: ""
+  OS_USERNAME: ""
+  OS_PASSWORD: ""