aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/cds
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/cds')
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml15
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/values.yaml15
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/templates/deployment.yaml4
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml6
4 files changed, 9 insertions, 31 deletions
diff --git a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
index 96312679d3..bc0f00c32d 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
@@ -36,20 +36,7 @@ spec:
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
- initContainers:
- {{- if .Values.global.mariadbGalera.localCluster }}
- {{- if .Values.global.mariadbGalera.useOperator }}
- {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local_operator ) | indent 6 | trim }}
- {{ else }}
- {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }}
- {{- end }}
- {{ else }}
- {{- if .Values.global.mariadbGalera.useOperator }}
- {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global_operator ) | indent 6 | trim }}
- {{ else }}
- {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }}
- {{- end }}
- {{- end }}
+ initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
- command:
- sh
args:
diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index a32afb0db3..b0812f26b8 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -229,18 +229,9 @@ resources:
unlimited: {}
readinessCheck:
- wait_for_global_operator:
- pods:
- - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
- wait_for_local_operator:
- pods:
- - '{{ .Values.config.cdsDB.dbServer }}-0'
- wait_for_global:
- apps:
- - '{{ .Values.global.mariadbGalera.nameOverride }}'
- wait_for_local:
- apps:
- - '{{ .Values.config.cdsDB.dbServer }}'
+ wait_for:
+ services:
+ - '{{ .Values.global.mariadbGalera.service }}'
#Pods Service Account
serviceAccount:
diff --git a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
index 9218a6e942..7e659bcf7b 100755
--- a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
@@ -27,8 +27,8 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
- - cds-blueprints-processor
+ - --service-name
+ - cds-blueprints-processor-http
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index a10623510b..6922b24c8e 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -27,10 +27,10 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- sdc-be
- - --container-name
- - cds-blueprints-processor
+ - --service-name
+ - cds-blueprints-processor-http
env:
- name: NAMESPACE
valueFrom: