summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/charts/sdc-es
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2018-04-24 20:05:32 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2018-04-25 14:41:49 +0000
commit51a8b1b6482fda1c0865481b7e04c54023589392 (patch)
tree2ae33b564def8fa11c372dcc8cb3c973e3af133f /kubernetes/sdc/charts/sdc-es
parent9b8b40b53451c9f4e77e7e46a4356a229806bca9 (diff)
Adding sdc-onboarding-be to OOM
-adding sdc-onboarding-be chart -sdc-cs and es are now in a cluster format -using the sdc provided ready probe script for readiness -increasing the initial delay as per sdc project team k8s specs -fixed logging bugs. logs for be, fe, onboard-be are now in /var/log/onap/sdc/blah -sdc-be readiness health check is failing which prevents sdb-be from becoming "ready". -the commit that changes the template is: Add cluster resiliance support (c033cdce906efc3b6ccd1d2f45544af47e328ed4) Issue-ID: OOM-1002 Change-Id: Ib231cb1e7daa287a41e04db95528edecbdbbf7bc Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/sdc/charts/sdc-es')
-rw-r--r--kubernetes/sdc/charts/sdc-es/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-es/templates/deployment.yaml25
-rw-r--r--kubernetes/sdc/charts/sdc-es/templates/job.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-es/values.yaml2
4 files changed, 6 insertions, 25 deletions
diff --git a/kubernetes/sdc/charts/sdc-es/Chart.yaml b/kubernetes/sdc/charts/sdc-es/Chart.yaml
index 2accff16b3..fa4d3417b3 100644
--- a/kubernetes/sdc/charts/sdc-es/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-es/Chart.yaml
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: Service Design and Creation Elasticsearch
+description: ONAP Service Design and Creation Elasticsearch
name: sdc-es
version: 2.0.0 \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
index 3ec8c563c9..fe085969a1 100644
--- a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
@@ -30,35 +30,20 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
- initContainers:
- - name: {{ include "common.name" . }}-logs-init
- command:
- - /bin/bash
- - "-c"
- - |
- mkdir -p /ubuntu-init/ASDC/ASDC-ES/
- chmod -R 777 /ubuntu-init/
- image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.global.ubuntuInitImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /ubuntu-init/
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
- # disable liveness probe when breakpoints set in debugger
- # so K8s doesn't restart unresponsive container
- {{- if eq .Values.liveness.enabled true }}
+ {{ if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
- {{ end -}}
+ {{ end }}
readinessProbe:
httpGet:
path: "_cluster/health?wait_for_status=yellow&timeout=120s"
@@ -83,8 +68,6 @@ spec:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
readOnly: true
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/lib/jetty/logs
- name: {{ include "common.fullname" . }}-data
mountPath: /usr/share/elasticsearch/data/
resources:
@@ -112,7 +95,5 @@ spec:
configMap:
name: {{ .Release.Name }}-sdc-environments-configmap
defaultMode: 0755
- - name: {{ include "common.fullname" . }}-logs
- emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/sdc/charts/sdc-es/templates/job.yaml b/kubernetes/sdc/charts/sdc-es/templates/job.yaml
index 0d2512cf7a..6fa0015066 100644
--- a/kubernetes/sdc/charts/sdc-es/templates/job.yaml
+++ b/kubernetes/sdc/charts/sdc-es/templates/job.yaml
@@ -47,7 +47,7 @@ spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-job
- image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.elasticInitImage }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.elasticInitImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml
index 32c54fe762..4b7440213c 100644
--- a/kubernetes/sdc/charts/sdc-es/values.yaml
+++ b/kubernetes/sdc/charts/sdc-es/values.yaml
@@ -59,7 +59,7 @@ liveness:
enabled: true
readiness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 60
periodSeconds: 10
service: