diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-31 12:07:23 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-04-07 11:04:23 +0000 |
| commit | f51bbef3978f1176551d6891c7e583d128a0875a (patch) | |
| tree | 3d0748e1b5f7090dc92108d85b2f4f587d7bb642 /kubernetes/holmes/components | |
| parent | bb32bf993ac2b74c12fc435e756d9ce98bb73611 (diff) | |
[COMMON][OTHERS] Fix dependency conditions
In case of local DB the "init" dependency is activated
as the "not" condition is not working
Issue-ID: OOM-3152
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I27dba69a644bbcc2b61245c22784976ba7c66173
Diffstat (limited to 'kubernetes/holmes/components')
4 files changed, 14 insertions, 6 deletions
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml index cdf5327eab..fdbca09be0 100644 --- a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml +++ b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml @@ -34,8 +34,10 @@ spec: metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: initContainers: - {{- if not .Values.global.postgres.localCluster }} - {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }} + {{- if .Values.global.postgres.localCluster }} + {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }} + {{ else }} + {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }} {{- end }} - name: {{ include "common.name" . }}-env-config image: {{ include "repositoryGenerator.image.envsubst" . }} diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml index c9c62e78a3..028ca8d71e 100644 --- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml +++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml @@ -123,9 +123,11 @@ resources: unlimited: {} readinessCheck: - wait_for: + wait_for_global: jobs: - '{{ include "common.release" . }}-holmes-postgres-init-config-job' + wait_for_local: + - '{{ .Values.global.postgres.container.name }}' #Pods Service Account serviceAccount: diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml index 05def922c4..db0eb16092 100644 --- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml +++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml @@ -33,8 +33,10 @@ spec: metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: initContainers: - {{- if not .Values.global.postgres.localCluster }} - {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }} + {{- if .Values.global.postgres.localCluster }} + {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }} + {{ else }} + {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }} {{- end }} - name: {{ include "common.name" . }}-env-config image: {{ include "repositoryGenerator.image.envsubst" . }} diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml index bc6639f7dd..543b7aa52c 100644 --- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml +++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml @@ -135,9 +135,11 @@ resources: unlimited: {} readinessCheck: - wait_for: + wait_for_global: jobs: - '{{ include "common.release" . }}-holmes-postgres-init-config-job' + wait_for_local: + - '{{ .Values.global.postgres.container.name }}' #Pods Service Account serviceAccount: |