X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-xapps%2F90-xApps%2Fhelm%2Fxapp-std%2Ftemplates%2Fdeployment.yaml;fp=ric-xapps%2F90-xApps%2Fhelm%2Fxapp-std%2Ftemplates%2Fdeployment.yaml;h=1e82e942fd3992d6164067af50bdf70fa0b506c1;hb=c60bed072004dd9071824704ed8a3718fbcaed6c;hp=295747ba51672fabf104fc9fafc15fb9144eb39d;hpb=e8411564c0887d17955cfe88aa394c1674b5ce42;p=it%2Fdep.git

diff --git a/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml
index 295747ba..1e82e942 100644
--- a/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml
+++ b/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml
@@ -1,19 +1,9 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#   Copyright (c) 2019 Nokia.                                                  #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   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.                                             #
-################################################################################
+#
+# ==================================================================================
+#   Copyright (c) 2019 Nokia
+# ==================================================================================
+#
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -35,57 +25,51 @@ spec:
         app.kubernetes.io/name: {{ include "ricapp.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
-      imagePullSecrets:
-        - name: {{ .Release.Name }}-docker-registry-key
+      hostname: {{ .Values.ricapp.hostname }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.global.repository }}/{{ .Values.ricapp.image.name }}:{{ .Values.ricapp.image.tag }}"
           imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-          # enable the next two elements if wanting to test pod bypassing its own entrypoint
-          #command: ["sh"]
-          #args:
-          #  - -c
-          #  - "while sleep 2; do echo thinking; done" 
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: {{ .Values.ricapp.service.port }}
+              protocol: TCP
+            - name: rmr
+              containerPort: {{ .Values.ricapp.service.rmrPort }}
               protocol: TCP
           volumeMounts:
             - name: config-volume
-              mountPath: {{ .Values.ricapp.appconfigpath }}
-            - name: secret-volume
-              mountPath: {{ .Values.ricapp.appsecretpath }}
-          envFrom:
-            - configMapRef:
-                name: {{ .Release.Name }}-appenv
+              mountPath: {{ .Values.ricapp.appconfig.path }}
+            - name: cert-volume
+              mountPath: {{ .Values.ricapp.cert.path }}
           livenessProbe:
-            exec:
-              command:
-                - /bin/bash
-                - -c
-                - ps -ef | grep {{ .Values.ricapp.livenessprocessname }}| grep -v "grep"
-            initialDelaySeconds: 120
-            periodSeconds: 30
+            httpGet:
+              path: {{ .Values.ricapp.probes.healthAliveCheckEndpoint }}
+              port: 8080
+            initialDelaySeconds: 5
+            periodSeconds: 15
           readinessProbe:
             httpGet:
-              path: /
-              port: http
+              path: {{ .Values.ricapp.probes.healthReadyCheckEndpoint }}
+              port: 8080
+            initialDelaySeconds: 5
+            periodSeconds: 15
           restartPolicy: Always
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml .Values.ricapp.resources | nindent 12 }}
           securityContext:
             # ubuntu
-            runAsUser: 1000
-            allowPrivilegeEscalation: false
-      {{- with .Values.nodeSelector }}
+            #runAsUser: 1000
+            #allowPrivilegeEscalation: false
+      {{- with .Values.ricapp.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-    {{- with .Values.affinity }}
+    {{- with .Values.ricapp.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-    {{- with .Values.tolerations }}
+    {{- with .Values.ricapp.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
@@ -93,7 +77,6 @@ spec:
       volumes:
         - name: config-volume
           configMap:
-            name: {{ .Release.Name }}-appconfig
-        - name: secret-volume
-          secret:
-            secretName: {{ .Release.Name }}-appsecret
+            name: {{ if .Values.ricapp.appconfig.override }}{{ .Values.ricapp.appconfig.override }}{{ else }}{{ .Release.Name }}-appconfig{{ end }}
+        - name: cert-volume
+          emptyDir: {}