From 1d12388430a6112d86200fdabba1f156d6bf2ef6 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Tue, 27 Mar 2018 01:26:59 +0000 Subject: Standardizing ONAP Portal -synched up with Beijing (master) -pods come up without cassandra music: sed: couldn't edit /docker-entrypoint-initdb.d/\ zzz_portal.cql: not a regular file ONAPPORTAL webapp in tomcat is failing to star resulting in HTTP 404 robot health Not sure how logging works in beijing so removed some of the ubuntu-init dir creation. need someone familiar with logging to investigate -addressed some CI comments. -removing configmap now that portaldb was fixed Issue-ID: OOM-746 Change-Id: I123d1ec6889db40b1721475a43665ef8efefc057 Signed-off-by: Mandeep Khinda --- .../portal-mariadb/templates/deployment.yaml | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml (limited to 'kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml') diff --git a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml new file mode 100644 index 0000000000..fd5e524d33 --- /dev/null +++ b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml @@ -0,0 +1,95 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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. + +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ include "common.fullname" . }} + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: {{ .Values.replicaCount }} + template: + metadata: + labels: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} + spec: + containers: + - name: {{ include "common.name" . }} + image: {{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + ports: + - containerPort: {{ .Values.service.internalPort }} + # disable liveness probe when breakpoints set in debugger + # so K8s doesn't restart unresponsive container + {{- if eq .Values.liveness.enabled true }} + livenessProbe: + tcpSocket: + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.liveness.periodSeconds }} + {{end -}} + readinessProbe: + tcpSocket: + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.readiness.periodSeconds }} + env: + - name: MYSQL_HOST + value: "{{ .Values.service.name }}" + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "common.fullname" . }} + key: db-root-password + volumeMounts: + - mountPath: /var/lib/mysql + name: mariadb-data + - mountPath: /etc/localtime + name: localtime + readOnly: true + - name: mariadb-docker-entrypoint-initdb + mountPath: /docker-entrypoint-initdb.d/zzz_apps_users_onboarding.sql + subPath: Apps_Users_OnBoarding_Script.sql + resources: +{{ toYaml .Values.resources | indent 12 }} + {{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 10 }} + {{- end -}} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 10 }} + {{- end }} + volumes: + {{- if .Values.persistence.enabled }} + - name: mariadb-data + persistentVolumeClaim: + claimName: {{ include "common.fullname" . }} + {{- else }} + emptyDir: {} + {{- end }} + - name: mariadb-docker-entrypoint-initdb + configMap: + name: {{ include "common.fullname" . }}-docker-entry-initd + - name: localtime + hostPath: + path: /etc/localtime + imagePullSecrets: + - name: "{{ include "common.namespace" . }}-docker-registry-key" -- cgit 1.2.3-korg