Adding Cluster Role Binding for RIC.

[ric-plt/ric-dep.git] / helm / e2mgr / templates / deployment.yaml

diff --git a/helm/e2mgr/templates/deployment.yaml b/helm/e2mgr/templates/deployment.yaml
index 04028a4..be648a5 100644 (file)
--- a/helm/e2mgr/templates/deployment.yaml
+++ b/helm/e2mgr/templates/deployment.yaml
@@ -16,6 +16,7 @@
 ################################################################################
 {{- $imagectx := dict "ctx" . "defaultregistry" .Values.e2mgr.image.registry }}
 {{- $pullpolicyctx := dict "ctx" . "defaultpullpolicy" .Values.e2mgr.imagePullPolicy }}
+{{- $common_env := .Values.common_env_variables }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -53,12 +54,16 @@ spec:
           - mountPath: /opt/E2Manager/router.txt
             name: local-router-file
             subPath: router.txt
+          - mountPath: /etc/config
+            name: e2mgr-loglevel-volume
           - mountPath: /opt/E2Manager/resources/configuration.yaml
             name: local-configuration-file
             subPath: configuration.yaml
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.e2mgr" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           ports:
             - name: "http"
               containerPort: {{ include "common.serviceport.e2mgr.http" . }}
@@ -70,6 +75,24 @@ spec:
           tty: true
           securityContext:
             privileged: {{ .Values.e2mgr.privilegedmode}}
+
+          {{- if eq .Values.e2mgr.liveness.enabled true }}
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.e2mgr.liveness.api }}
+              port: {{ include "common.serviceport.e2mgr.http" . }}
+            initialDelaySeconds: {{ .Values.e2mgr.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.e2mgr.liveness.periodSeconds }}
+          {{- end }}
+          {{- if eq .Values.e2mgr.readiness.enabled true }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.e2mgr.readiness.api }}
+              port: {{ include "common.serviceport.e2mgr.http" . }}
+            initialDelaySeconds: {{ .Values.e2mgr.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.e2mgr.liveness.periodSeconds }}
+          {{- end }}
+
       volumes:
         - name: local-router-file
           configMap:
@@ -77,3 +100,10 @@ spec:
         - name: local-configuration-file
           configMap:
             name: {{ include "common.configmapname.e2mgr" . }}-configuration-configmap
+        - name: e2mgr-loglevel-volume
+          configMap:
+              name: {{ include "common.configmapname.e2mgr" . }}-loglevel-configmap
+              items:
+                - key: logcfg
+                  path: log-level.yaml
+                  mode: 0644