Add options to configure livenessprobe using values.yaml file. Fix some minor problems.

[it/dep.git] / ric-xapps / 90-xApps / helm / xapp-std / templates / deployment.yaml

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 295747b..b539b9b 100644 (file)
--- a/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml
+++ b/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml
@@ -13,87 +13,61 @@
 #   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.                                             #
-################################################################################
+################################################################################'
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "ricapp.fullname" . }}
+  name: {{ include "ricxapp.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "ricapp.name" . }}
-    helm.sh/chart: {{ include "ricapp.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.ricapp.replicaCount }}
+  replicas: {{ .Values.ricxapp.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "ricapp.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "ricapp.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
+        release: {{ .Release.Name }}
     spec:
+      hostname: {{ include "ricxapp.name" . }}
       imagePullSecrets:
-        - name: {{ .Release.Name }}-docker-registry-key
+        - name: {{ include "ricxapp.imagepullsecret" . }}
       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" 
+        - name: {{ include "ricxapp.containername" . }}
+          image: "{{ .Values.ricxapp.image.repository }}/{{ .Values.ricxapp.image.name }}:{{ .Values.ricxapp.image.tag }}"
+          imagePullPolicy: {{ .Values.ricxapp.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: {{ .Values.ricxapp.service.http.containerPort }}
+              protocol: TCP
+            - name: rmrroute
+              containerPort: {{ .Values.ricxapp.service.rmr.route.port }}
+              protocol: TCP
+            - name: rmrdata
+              containerPort: {{ .Values.ricxapp.service.rmr.data.port }}
               protocol: TCP
           volumeMounts:
             - name: config-volume
-              mountPath: {{ .Values.ricapp.appconfigpath }}
-            - name: secret-volume
-              mountPath: {{ .Values.ricapp.appsecretpath }}
+              mountPath: {{ .Values.ricxapp.appconfig.path }}
           envFrom:
             - configMapRef:
-                name: {{ .Release.Name }}-appenv
+                name: {{ include "ricxapp.configmapname" . }}-appenv
+          {{- if .Values.ricxapp.livenessProbe }}
           livenessProbe:
-            exec:
-              command:
-                - /bin/bash
-                - -c
-                - ps -ef | grep {{ .Values.ricapp.livenessprocessname }}| grep -v "grep"
-            initialDelaySeconds: 120
-            periodSeconds: 30
+            {{- .Values.ricxapp.livenessProbe | nindent 12 -}}
+          {{ end }}
+          {{- if .Values.ricxapp.readinessProbe }}
           readinessProbe:
-            httpGet:
-              path: /
-              port: http
+            {{- .Values.ricxapp.readinessProbe | nindent 12 -}}
+          {{ end }}
           restartPolicy: Always
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          securityContext:
-            # ubuntu
-            runAsUser: 1000
-            allowPrivilegeEscalation: false
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-
       volumes:
         - name: config-volume
           configMap:
-            name: {{ .Release.Name }}-appconfig
-        - name: secret-volume
-          secret:
-            secretName: {{ .Release.Name }}-appsecret
+            name: {{ include "ricxapp.configmapname" . }}-appconfig