diff options
14 files changed, 50 insertions, 18 deletions
diff --git a/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml index ec1932143d..190b89d530 100755 --- a/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml +++ b/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml @@ -20,6 +20,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ .Values.replicaCount }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} minReadySeconds: {{ index .Values.minReadySeconds }} strategy: type: {{ index .Values.updateStrategy.type }} @@ -65,7 +66,8 @@ spec: readOnly: true - name: {{ include "common.fullname" . }}-logs mountPath: {{ .Values.log.path }} -{{ include "so.helpers.livenessProbe" .| indent 8 }} + {{- include "so.helpers.startupProbe" .| indent 8 }} + {{- include "so.helpers.livenessProbe" .| indent 8 }} ports: {{ include "common.containerPorts" . | nindent 10 }} # Filebeat sidecar container {{ include "common.log.sidecar" . | nindent 6 }} diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 136c9ad0b8..d2c5fa2b47 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -33,6 +33,8 @@ readinessCheck: wait_for: jobs: - '{{ include "common.release" . }}-so-mariadb-config-job' + services: + - 'so-catalog-db-adapter' ################################################################# # Secrets metaconfig @@ -136,6 +138,7 @@ vnf: version: v2 replicaCount: 1 +revisionHistoryLimit: 1 minReadySeconds: 10 containerPort: &containerPort 8081 logPath: ./logs/bpmn/ @@ -178,8 +181,7 @@ resources: livenessProbe: path: /manage/health scheme: HTTP - initialDelaySeconds: 600 - periodSeconds: 60 + periodSeconds: 20 timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 diff --git a/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml index e3a77de71d..02673ecce5 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml @@ -19,6 +19,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ .Values.replicaCount }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} minReadySeconds: {{ index .Values.minReadySeconds }} strategy: type: {{ index .Values.updateStrategy.type }} @@ -57,7 +58,8 @@ spec: - name: config mountPath: /app/config readOnly: true -{{ include "so.helpers.livenessProbe" .| indent 8 }} + {{- include "so.helpers.startupProbe" .| indent 8 }} + {{- include "so.helpers.livenessProbe" .| indent 8 }} ports: {{ include "common.containerPorts" . | nindent 10 }} serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}} volumes: diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml index 5a5325f629..85f7467038 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml @@ -82,6 +82,7 @@ mso: auth: Basic YnBlbDpwYXNzd29yZDEk replicaCount: 1 +revisionHistoryLimit: 1 minReadySeconds: 10 containerPort: &containerPort 8082 logPath: ./logs/catdb/ @@ -125,8 +126,7 @@ livenessProbe: path: /manage/health port: 8082 scheme: HTTP - initialDelaySeconds: 600 - periodSeconds: 60 + periodSeconds: 20 timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 diff --git a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml index d8670f1c41..60baffad14 100755 --- a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml @@ -20,6 +20,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ index .Values.replicaCount }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} minReadySeconds: {{ index .Values.minReadySeconds }} strategy: type: {{ index .Values.updateStrategy.type }} @@ -80,12 +81,12 @@ spec: readOnly: true - name: encoder mountPath: /input + {{- include "so.helpers.startupProbe" .| indent 10 }} livenessProbe: httpGet: path: {{ index .Values.livenessProbe.path}} port: {{ index .Values.containerPort }} scheme: {{ index .Values.livenessProbe.scheme}} - initialDelaySeconds: {{ index .Values.livenessProbe.initialDelaySeconds}} periodSeconds: {{ index .Values.livenessProbe.periodSeconds}} timeoutSeconds: {{ index .Values.livenessProbe.timeoutSeconds}} successThreshold: {{ index .Values.livenessProbe.successThreshold}} diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml index 32f87270a6..cf2b2bcdf8 100755 --- a/kubernetes/so/components/so-cnf-adapter/values.yaml +++ b/kubernetes/so/components/so-cnf-adapter/values.yaml @@ -104,6 +104,7 @@ mso: requestDb: auth: ${REQUEST_AUTH} replicaCount: 1 +revisionHistoryLimit: 1 minReadySeconds: 10 containerPort: &containerPort 8090 logPath: ./logs/cnf-adapter/ @@ -147,8 +148,7 @@ livenessProbe: path: /manage/health port: 8090 scheme: HTTP - initialDelaySeconds: 600 - periodSeconds: 60 + periodSeconds: 20 timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 diff --git a/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml b/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml index 45572c9692..040fbadc3d 100644 --- a/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml +++ b/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml @@ -18,6 +18,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ index .Values.replicaCount }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} minReadySeconds: {{ index .Values.minReadySeconds }} strategy: type: {{ index .Values.updateStrategy.type }} diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml index 9a85ec8c98..b9955f285f 100644 --- a/kubernetes/so/components/so-cnfm-lcm/values.yaml +++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml @@ -77,6 +77,7 @@ sdc: key: 566B754875657232314F5548556D3665 replicaCount: 1 +revisionHistoryLimit: 1 minReadySeconds: 10 containerPort: &containerPort 9888 logPath: ./logs/so-cnfm-lcm/ @@ -119,9 +120,9 @@ resources: livenessProbe: port: *containerPort - initialDelaySeconds: 600 - periodSeconds: 60 + periodSeconds: 20 timeoutSeconds: 10 + initialDelaySeconds: 60 successThreshold: 1 failureThreshold: 3 @@ -152,4 +153,3 @@ serviceAccount: nameOverride: so-cnfm-lcm roles: - read - diff --git a/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml index 329d45e480..93eef57795 100755 --- a/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml @@ -19,6 +19,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ index .Values.replicaCount }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} minReadySeconds: {{ index .Values.minReadySeconds }} strategy: type: {{ index .Values.updateStrategy.type }} @@ -57,7 +58,8 @@ spec: - name: config mountPath: /app/config readOnly: true -{{ include "so.helpers.livenessProbe" .| indent 8 }} + {{- include "so.helpers.startupProbe" .| indent 8 }} + {{- include "so.helpers.livenessProbe" .| indent 8 }} ports: {{- include "common.containerPorts" . | nindent 10 }} serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}} volumes: diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index 0e12f5150f..d6cad0744b 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-adapter/values.yaml @@ -80,6 +80,7 @@ mso: auth: Basic YnBlbDpwYXNzd29yZDEk replicaCount: 1 +revisionHistoryLimit: 1 minReadySeconds: 10 containerPort: &containerPort 8083 logPath: ./logs/reqdb/ @@ -123,8 +124,7 @@ livenessProbe: path: /manage/health port: 8083 scheme: HTTP - initialDelaySeconds: 600 - periodSeconds: 60 + periodSeconds: 20 timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml index 36ce3fae70..280e3e237e 100755 --- a/kubernetes/so/components/soHelpers/Chart.yaml +++ b/kubernetes/so/components/soHelpers/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 description: A Helm chart for SO helpers name: soHelpers -version: 13.0.0 +version: 13.0.1 dependencies: - name: common diff --git a/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl b/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl index e596b806ed..70ea57c709 100644 --- a/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl +++ b/kubernetes/so/components/soHelpers/templates/_livenessProbe.tpl @@ -7,7 +7,9 @@ livenessProbe: path: {{ $subchartDot.Values.livenessProbe.path }} port: {{ $subchartDot.Values.containerPort }} scheme: {{ $subchartDot.Values.livenessProbe.scheme }} +{{- if $subchartDot.Values.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ $subchartDot.Values.livenessProbe.initialDelaySeconds }} +{{- end }} periodSeconds: {{ $subchartDot.Values.livenessProbe.periodSeconds }} timeoutSeconds: {{ $subchartDot.Values.livenessProbe.timeoutSeconds }} successThreshold: {{ $subchartDot.Values.livenessProbe.successThreshold }} diff --git a/kubernetes/so/components/soHelpers/templates/_startupProbe.tpl b/kubernetes/so/components/soHelpers/templates/_startupProbe.tpl new file mode 100644 index 0000000000..3ea89160b7 --- /dev/null +++ b/kubernetes/so/components/soHelpers/templates/_startupProbe.tpl @@ -0,0 +1,14 @@ +{{- define "so.helpers.startupProbe" -}} +{{- $dot := default . .dot -}} +{{- $initRoot := default $dot.Values.soHelpers .initRoot -}} +{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} +startupProbe: + httpGet: + path: {{ $subchartDot.Values.startupProbe.path }} + port: {{ $subchartDot.Values.containerPort }} + scheme: {{ $subchartDot.Values.startupProbe.scheme }} + periodSeconds: {{ $subchartDot.Values.startupProbe.periodSeconds }} + timeoutSeconds: {{ $subchartDot.Values.startupProbe.timeoutSeconds }} + successThreshold: {{ $subchartDot.Values.startupProbe.successThreshold }} + failureThreshold: {{ $subchartDot.Values.startupProbe.failureThreshold }} +{{- end -}} diff --git a/kubernetes/so/components/soHelpers/values.yaml b/kubernetes/so/components/soHelpers/values.yaml index ec3fef2d81..0da387faaa 100755 --- a/kubernetes/so/components/soHelpers/values.yaml +++ b/kubernetes/so/components/soHelpers/values.yaml @@ -24,11 +24,17 @@ global: # Application configuration defaults. ################################################################# +startupProbe: + path: /manage/health + scheme: HTTP + periodSeconds: 3 + timeoutSeconds: 3 + successThreshold: 1 + failureThreshold: 200 livenessProbe: path: /manage/health scheme: HTTP - initialDelaySeconds: 600 - periodSeconds: 60 + periodSeconds: 20 timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 |