summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/components/sdc-be
diff options
context:
space:
mode:
authorothman touijer <othman.touijer@soprasteria.com>2022-01-05 14:40:37 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2022-01-25 18:26:59 +0100
commit2b764d035310d91744b4c22ace83593b9a561116 (patch)
treef637fd322498ce1246d49bf92195352f10d17a0e /kubernetes/sdc/components/sdc-be
parent0df88b139440c5bb2f0e46e5195bc2455554dc4d (diff)
[SDC] Service Mesh Compliance for SDC
Adding basic requirements for Service Mesh Compliance within SDC. Change-Id: Ib9104ef2e8b6daf0b9b529288cee158b297ce9e4 Issue-ID: OOM-2253 Signed-off-by: rope252 <gareth.roper@est.tech> Signed-off-by: othman touijer <othman.touijer@soprasteria.com>
Diffstat (limited to 'kubernetes/sdc/components/sdc-be')
-rw-r--r--kubernetes/sdc/components/sdc-be/templates/deployment.yaml28
-rw-r--r--kubernetes/sdc/components/sdc-be/templates/job.yaml1
-rw-r--r--kubernetes/sdc/components/sdc-be/values.yaml12
3 files changed, 25 insertions, 16 deletions
diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 5a5fcd6f75..24f169a5b9 100644
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -98,9 +98,9 @@ spec:
cpu: 3m
memory: 20Mi
volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
- - name: {{ include "common.fullname" . }}-environments
+ - name: sdc-environments-input
mountPath: /config-input/
- - name: sdc-environments-output
+ - name: sdc-environments
mountPath: /config-output/
{{- end }}
containers:
@@ -160,20 +160,22 @@ spec:
fieldRef:
fieldPath: status.podIP
volumeMounts:
- - name: sdc-environments-output
+ - name: sdc-environments
mountPath: /app/jetty/chef-solo/environments/
- - name: sdc-environments-output
+ {{- if .Values.global.aafEnabled }}
+ - name: sdc-environments
mountPath: /app/jetty/chef-solo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12
subPath: org.onap.sdc.p12
- - name: sdc-environments-output
+ - name: sdc-environments
mountPath: /app/jetty/chef-solo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks
subPath: org.onap.sdc.trust.jks
- - name: {{ include "common.fullname" . }}-localtime
+ {{- end }}
+ - name: localtime
mountPath: /etc/localtime
readOnly: true
- name: logs
mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-logback
+ - name: logback
mountPath: /tmp/logback.xml
subPath: logback.xml
lifecycle:
@@ -184,19 +186,21 @@ spec:
{{ include "common.log.sidecar" . | nindent 8 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
- - name: {{ include "common.fullname" . }}-localtime
+ - name: localtime
hostPath:
path: /etc/localtime
{{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 6 }}
- - name: {{ include "common.fullname" . }}-logback
+ - name: logback
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
- - name: {{ include "common.fullname" . }}-environments
+ - name: sdc-environments
+ {{- if .Values.global.aafEnabled }}
+ emptyDir: { medium: "Memory" }
+ - name: sdc-environments-input
+ {{- end }}
configMap:
name: {{ include "common.release" . }}-sdc-environments-configmap
defaultMode: 0755
- - name: sdc-environments-output
- emptyDir: { medium: "Memory" }
- name: logs
emptyDir: {}
imagePullSecrets:
diff --git a/kubernetes/sdc/components/sdc-be/templates/job.yaml b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index aaf8fada28..5f70991e6f 100644
--- a/kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/job.yaml
@@ -79,6 +79,7 @@ spec:
requests:
cpu: 200m
memory: 200Mi
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap:
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 7b11692d4b..0ae39bf436 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -85,7 +85,7 @@ affinity: {}
liveness:
initialDelaySeconds: 1
periodSeconds: 10
- timeoutSeconds: 5
+ timeoutSeconds: 180
successThreshold: 1
failureThreshold: 3
# necessary to disable liveness probe when setting breakpoints
@@ -95,14 +95,14 @@ liveness:
readiness:
initialDelaySeconds: 1
periodSeconds: 10
- timeoutSeconds: 5
+ timeoutSeconds: 180
successThreshold: 1
failureThreshold: 3
startup:
initialDelaySeconds: 10
periodSeconds: 10
- timeoutSeconds: 5
+ timeoutSeconds: 180
successThreshold: 1
failureThreshold: 60
@@ -126,7 +126,7 @@ service:
visualRange: "1"
serviceName: sdc-deprecated
ports:
- - name: api
+ - name: tcp-api
port: 8443
plain_port: 8080
port_protocol: http
@@ -168,6 +168,10 @@ serviceAccount:
roles:
- read
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}-job'
+
#Log configuration
log:
path: /var/log/onap