diff options
Diffstat (limited to 'kubernetes/holmes')
6 files changed, 20 insertions, 8 deletions
diff --git a/kubernetes/holmes/Chart.yaml b/kubernetes/holmes/Chart.yaml index 971d81c614..8f8e91d47f 100644 --- a/kubernetes/holmes/Chart.yaml +++ b/kubernetes/holmes/Chart.yaml @@ -34,7 +34,7 @@ dependencies: - name: postgres-init version: ~12.x-0 repository: '@local' - condition: not global.postgres.localCluster + condition: global.postgres.globalCluster - name: holmes-rule-mgmt version: ~12.x-0 repository: 'file://components/holmes-rule-mgmt' 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..d91bb1eeeb 100644 --- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml +++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml @@ -94,7 +94,7 @@ ingress: path: "/api/holmes-rule-mgmt/v1" plain_port: 9101 - baseaddr: "holmes-rule-mgmt-ui" - name: "holmes-rule-mgmt-ui" + name: "holmes-rule-mgmt" path: "/iui/holmes" plain_port: 9104 config: @@ -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: diff --git a/kubernetes/holmes/values.yaml b/kubernetes/holmes/values.yaml index e8eb53d140..40c3d872ff 100644 --- a/kubernetes/holmes/values.yaml +++ b/kubernetes/holmes/values.yaml @@ -22,7 +22,11 @@ global: #Service Names of the postgres db to connect to. #Override it to dbc-pg if localCluster is enabled. postgres: + #This flag allows SO to instantiate its own mariadb-galera cluster + #When changing it to "true", also set "globalCluster: false" + #as the dependency check will not work otherwise (Chart.yaml) localCluster: false + globalCluster: true service: name: pgset name2: &postgres tcp-pgset-primary |