repository: nexus3.onap.org:10001
repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
# readiness check
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
# logging agent
loggingRepository: docker.elastic.co
{{ else }}
- /app/ready.py
args:
- - --app-name
- {{- if .Values.global.cassandra.localCluster }}
- - aai-cassandra
- {{- else }}
- - cassandra
- {{- end }}
- - --container-name
+ - --service-name
+ - {{ .Values.global.cassandra.serviceName }}
+ - --service-name
- aai-schema-service
{{ end }}
env:
- command:
- /bin/bash
- -c
- - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra
+ - /app/ready.py --service-name {{ .Values.global.cassandra.serviceName }}
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --app-name
- {{- if .Values.global.cassandra.localCluster }}
- - aai-cassandra
- {{- else }}
- - cassandra
- {{- end }}
- - --container-name
+ - --service-name
+ - {{ .Values.global.cassandra.serviceName }}
+ - --service-name
- aai-schema-service
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --app-name
- {{- if .Values.global.cassandra.localCluster }}
- - aai-cassandra
- {{- else }}
- - cassandra
- {{- end }}
- - --container-name
+ - --service-name
+ - {{ .Values.global.cassandra.serviceName }}
+ - --service-name
- aai-schema-service
env:
- name: NAMESPACE
- command:
- /bin/bash
- -c
- - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra
+ - /app/ready.py --service-name {{ .Values.global.cassandra.serviceName }}
env:
- name: NAMESPACE
valueFrom:
- --job-name
- {{ include "common.release" . }}-aai-graphadmin-create-db-schema
{{- else }}
- - --app-name
- {{- if .Values.global.cassandra.localCluster }}
- - aai-cassandra
- {{- else }}
- - cassandra
- {{- end }}
- - --container-name
+ - --service-name
+ - {{ .Values.global.cassandra.serviceName }}
+ - --service-name
- aai-schema-service
{{- end }}
{{- end }}
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- aai
env:
- name: NAMESPACE
- --job-name
- {{ include "common.release" . }}-aai-graphadmin-create-db-schema
{{- else }}
- - --app-name
- {{- if .Values.global.cassandra.localCluster }}
- - aai-cassandra
- {{- else }}
- - cassandra
- {{- end }}
- - --container-name
+ - --service-name
+ - {{ .Values.global.cassandra.serviceName }}
+ - --service-name
- aai-schema-service
{{- end }}
{{- end }}
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- aai
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- aai-resources
- - --container-name
+ - --service-name
- aai-traversal
- - --container-name
+ - --service-name
- aai-graphadmin
env:
- name: NAMESPACE
dockerhubRepository: docker.io
busyboxImage: busybox
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
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:
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:
- command:
- /app/ready.py
args:
- - --container-name
- - cds-blueprints-processor
+ - --service-name
+ - cds-blueprints-processor-http
env:
- name: NAMESPACE
valueFrom:
- 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:
content: mariadb-galera
- equal:
path: spec.template.spec.initContainers[0].image
- value: nexus3.onap.org:10001/onap/oom/readiness:6.0.2
+ value: nexus3.onap.org:10001/onap/oom/readiness:6.0.3
- equal:
path: spec.template.spec.initContainers[0].imagePullPolicy
value: IfNotPresent
mariadbImage: bitnami/mariadb:10.5.8
nginxImage: bitnami/nginx:1.21.4
postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
drProvClientImage: onap/dmaap/datarouter-prov-client:2.1.15
- quitQuitImage: onap/oom/readiness:6.0.2
+ quitQuitImage: onap/oom/readiness:6.0.3
# Default credentials
# they're optional. If the target repository doesn't need them, comment them
readinessCheck:
wait_for:
- - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
+ services:
+ - '{{ .Values.global.postgres.service.name2 }}'
minReadySeconds: 10
updateStrategy:
readinessCheck:
wait_for:
- - cps-temporal-db
+ services:
+ - cps-temporal-db
minReadySeconds: 10
updateStrategy:
readinessCheck:
wait_for:
- - cps-core
+ services:
+ - cps-core
minReadySeconds: 10
updateStrategy:
# to be sure that we can provision the DR feed that's needed
readinessCheck:
wait_for:
- containers:
+ services:
- dmaap-dr-node
- message-router
# Dependencies
readinessCheck:
wait_for:
- - dcae-datalake-feeder
+ services:
+ - dl-feeder
# Probe Configuration
readiness:
# Dependencies
readinessCheck:
wait_for:
- - dcae-datalake-feeder
+ services:
+ - dl-feeder
# Probe Configuration
readiness:
path: /var/log/ONAP/dcaegen2/services/datalake
logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
-# Dependencies
-readinessCheck:
- wait_for:
- - &postgresName dcae-datalake-postgres
-
# Probe Configuration
readiness:
initialDelaySeconds: 90
# Application configuration Overriding Defaults in the Postgres.
#################################################################
postgres:
- nameOverride: *postgresName
+ nameOverride: &postgresName dcae-datalake-postgres
service:
name: *postgresName
name2: dcae-datalake-pg-primary
pgDatabase: datalake
pgUserExternalSecret: *pgUserCredsSecretName
+readinessCheck:
+ wait_for:
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
+
#Pods Service Account
serviceAccount:
nameOverride: dcae-datalake-feeder
path: /var/log/ONAP/dcaegen2/services/heartbeat
logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
-# Dependencies
-readinessCheck:
- wait_for:
- - &postgresName dcae-heartbeat-postgres
- - message-router
-
# Probe Configuration
readiness:
initialDelaySeconds: 10
# Application configuration Overriding Defaults in the Postgres.
#################################################################
postgres:
- nameOverride: *postgresName
+ nameOverride: &postgresName dcae-heartbeat-postgres
service:
name: *postgresName
name2: dcae-heartbeat-pg-primary
pgDatabase: heartbeat
pgUserExternalSecret: *pgUserCredsSecretName
+# Dependencies
+readinessCheck:
+ wait_for:
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
+ - message-router
+
#Pods Service Account
serviceAccount:
nameOverride: dcae-heartbeat
# Dependencies
readinessCheck:
wait_for:
- - message-router
+ services:
+ - message-router
# Probe Configuration
readiness:
# subscription to the feed.
readinessCheck:
wait_for:
- containers:
- - dcae-datafile-collector
+ services:
+ - datafile-collector
# Probe Configuration
readiness:
path: /var/log/ONAP/dcaegen2/services/pmsh
logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
-# Dependencies
-readinessCheck:
- wait_for:
- - &postgresName dcae-pmsh-postgres
- - message-router
-
# Probe Configuration
readiness:
initialDelaySeconds: 10
# Application configuration Overriding Defaults in the Postgres.
#################################################################
postgres:
- nameOverride: *postgresName
+ nameOverride: &postgresName dcae-pmsh-postgres
service:
name: *postgresName
name2: *dcaePmshPgPrimary
pgDatabase: pmsh
pgUserExternalSecret: *pgUserCredsSecretName
+# Dependencies
+readinessCheck:
+ wait_for:
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
+ - message-router
+
#Pods Service Account
serviceAccount:
nameOverride: dcae-pmsh
# Dependencies
readinessCheck:
wait_for:
- - message-router
+ services:
+ - message-router
# Probe Configuration
readiness:
path: /var/log/ONAP/dcaegen2/services/sliceanalysisms
logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
-# Dependencies
-readinessCheck:
- wait_for:
- - &postgresName dcae-sliceanalysisms-postgres
- - message-router
-
# Probe Configuration
readiness:
initialDelaySeconds: 60
# Application configuration Overriding Defaults in the Postgres.
#################################################################
postgres:
- nameOverride: *postgresName
+ nameOverride: &postgresName dcae-sliceanalysisms-postgres
service:
name: *postgresName
name2: dcae-sliceanalysisms-pg-primary
pgDatabase: sliceanalysisms
pgUserExternalSecret: *pgUserCredsSecretName
+# Dependencies
+readinessCheck:
+ wait_for:
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
+ - message-router
+
#Pods Service Account
serviceAccount:
nameOverride: dcae-slice-analysis-ms
# Dependencies
readinessCheck:
wait_for:
- - message-router
+ services:
+ - message-router
# Probe Configuration
readiness:
# policyID: |
# '["com.Config_PCIMS_CONFIG_POLICY"]'
-# Dependencies
-readinessCheck:
- wait_for:
- - &postgresName dcae-sonhms-postgres
- - message-router
-
# Probe Configuration
readiness:
initialDelaySeconds: 10
# Application configuration Overriding Defaults in the Postgres.
#################################################################
postgres:
- nameOverride: *postgresName
+ nameOverride: &postgresName dcae-sonhms-postgres
service:
name: *postgresName
name2: *dcaeSonhmsPgPrimary
pgDatabase: sonhms
pgUserExternalSecret: *pgUserCredsSecretName
+# Dependencies
+readinessCheck:
+ wait_for:
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
+ - message-router
+
#Pods Service Account
serviceAccount:
nameOverride: dcae-son-handler
# dependencies
readinessCheck:
wait_for:
- - message-router
+ services:
+ - message-router
# probe configuration
readiness:
# Dependencies
readinessCheck:
wait_for:
- - message-router
+ services:
+ - message-router
# Service Configuration
service:
readinessCheck:
wait_for:
- - sdc-be
+ services:
+ - sdc-be
flavor: small
resources:
readinessCheck:
wait_for:
- - dmaap-dr-prov
+ services:
+ - dmaap-dr-prov
jobs:
- '{{ include "common.release" . }}-holmes-postgres-init-config-job'
wait_for_local:
- - '{{ .Values.global.postgres.container.name }}'
+ services:
+ - '{{ .Values.global.postgres.service.name2 }}'
#Pods Service Account
serviceAccount:
jobs:
- '{{ include "common.release" . }}-holmes-postgres-init-config-job'
wait_for_local:
- - '{{ .Values.global.postgres.container.name }}'
+ services:
+ - '{{ .Values.global.postgres.service.name2 }}'
#Pods Service Account
serviceAccount:
- /app/ready.py
args:
{{- if .Values.global.mariadbGalera.localCluster }}
- - --app-name
- - {{ index .Values "mariadb-galera" "nameOverride" }}
+ - --service-name
+ - {{ index .Values "mariadb-galera" "service" "name" }}
{{- else }}
- --job-name
- {{ include "common.release" . }}-etsicatalog-db-config-job
cpu: "3m"
memory: "20Mi"
{{ if .Values.config.msb_enabled }}
- {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for.msb ) | indent 6 | trim }}
+ {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
{{ end }}
- command:
- /bin/sh
readinessCheck:
wait_for:
- msb:
- name: msb
- containers:
- - msb-iag
+ services:
+ - msb-iag
#################################################################
# Secrets metaconfig
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- msb-discovery
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- msb-consul
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- msb-discovery
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- msb-discovery
env:
- name: NAMESPACE
#repository: nexus3.onap.org:10001
# readiness check
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
# logging agent - temporary repo until images migrated to nexus3
loggingRepository: docker.elastic.co
password: docker
# readiness check
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
# logging agent - temporary repo until images migrated to nexus3
loggingRepository: docker.elastic.co
postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
# readiness check image
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
# image pull policy
pullPolicy: Always
readinessCheck:
wait_for:
- - oof-has-controller
+ apps:
+ - oof-has-controller
#Pods Service Account
serviceAccount:
readinessCheck:
wait_for:
- - policy-xacml-pdp
+ services:
+ - policy-xacml-pdp
#Pods Service Account
serviceAccount:
- name: repositoryGenerator
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
- name: serviceAccount
version: ~13.x-0
repository: '@local'
# Global
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
busyboxRepository: registry.hub.docker.com
memory: "60Mi"
readinessCheck:
wait_for:
- - oom-cert-service
+ services:
+ - oom-cert-service
# CMPv2Issuer
cmpv2issuer:
command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- ejbca-ejbca
env:
- name: NAMESPACE
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
+
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
\ No newline at end of file
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
+
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- {{ .Values.nexus.name }}
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- policy-clamp-runtime-acm
env:
- name: NAMESPACE
- name: serviceAccount
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
spec:
{{- include "common.imagePullSecrets" . | nindent 6 }}
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 }}
+ {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_mariadb ) | indent 6 | trim }}
containers:
- name: {{ include "common.name" . }}-galera-config
image: {{ include "repositoryGenerator.image.mariadb" . }}
name: {{ include "common.name" . }}-pg-init
spec:
{{- include "common.imagePullSecrets" . | nindent 6 }}
- initContainers: {{ if .Values.global.postgres.localCluster }}{{ include "common.readinessCheck.waitFor" . | nindent 6 }}{{ end }}
+ initContainers:
+ {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_postgres ) | indent 6 | trim }}
containers:
- name: {{ include "common.name" . }}-pg-config
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.postgresImage }}
pgRootPasswordExternalSecret: *dbRootPassSecretName
readinessCheck:
- wait_for:
- - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
- wait_for_global_operator:
- pods:
- - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
- wait_for_local_operator:
- pods:
- - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
- wait_for_global:
- apps:
- - '{{ include "common.mariadbAppName" . }}'
- wait_for_local:
- apps:
- - '{{ include "common.mariadbAppName" . }}'
+ wait_for_postgres:
+ services:
+ - '{{ .Values.global.postgres.service.name2 }}'
+ wait_for_mariadb:
+ services:
+ - '{{ include "common.mariadbService" . }}'
restServer:
policyPapUserName: policyadmin
command:
- /app/ready.py
args:
- - --container-name
- - "sdc-onboarding-be"
+ - --service-name
+ - sdc-onboarding-be
{{- if not .Values.global.kafka.useKafka }}
- - --container-name
- - "message-router"
+ - --service-name
+ - message-router
{{- end }}
env:
- name: NAMESPACE
command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- sdc-be
- "-t"
- "35"
command:
- /app/ready.py
args:
- - --app-name
- {{- if .Values.global.sdc_cassandra.localCluster }}
- - sdc-cs
- {{- else }}
- - cassandra
- {{- end }}
+ - --service-name
+ - {{ .Values.global.sdc_cassandra.serviceName }}
- "-t"
- "15"
env:
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
sdc_cassandra:
command:
- /app/ready.py
args:
- - --container-name
- - "sdc-wfd-be"
+ - --service-name
+ - sdc-wfd-be
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --app-name
- - {{ include "common.mariadbAppName" . }}
- - --container-name
+ - --service-name
+ - {{ include "common.mariadbService" . }}
+ - --service-name
- {{ .Values.config.sdncChartName }}
- - --container-name
+ - --service-name
- {{ .Values.config.msgRouterContainerName }}
env:
- name: NAMESPACE
- /app/ready.py
args:
{{- if .Values.global.mariadbGalera.localCluster }}
- - --app-name
- - {{ index .Values "mariadb-galera" "nameOverride" }}
+ - --service-name
+ - {{ include "common.mariadbService" . }}
{{- else }}
- --job-name
- {{ include "common.release" . }}-{{ index .Values "mariadb-init" "nameOverride" }}-config-job
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- {{ .Values.config.sdncChartName }}
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- sdnc
- - --container-name
+ - --service-name
- consul
env:
- name: NAMESPACE
command:
- /app/ready.py
args:
- - --container-name
+ - --service-name
- {{ .Values.config.sdncChartName }}
env:
- name: NAMESPACE
- command:
- /app/ready.py
args:
- - --app-name
- - {{ include "common.mariadbAppName" . }}
- - --container-name
+ - --service-name
+ - {{ include "common.mariadbService" . }}
+ - --service-name
- {{ .Values.config.sdncChartName }}
- - --container-name
+ - --service-name
- {{ .Values.config.sdcbeChartName }}
- - --container-name
+ - --service-name
- {{ .Values.config.msgRouterContainerName }}
env:
- name: NAMESPACE
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
spec:
- initContainers:
+ initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
- command:
- sh
args:
image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
-
- {{- 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 }}
containers:
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
- /app/ready.py
args:
{{- if .Values.config.sdnr.mariadb.enabled }}
- - --app-name
- - {{ include "common.mariadbAppName" . }}
+ - --service-name
+ - {{ include "common.mariadbService" . }}
{{- else }}
- --container-name
- {{.Values.elasticsearch.nameOverride}}-elasticsearch
- /app/ready.py
args:
{{ if .Values.dgbuilder.enabled -}}
- - --app-name
- - {{ include "common.mariadbAppName" . }}
+ - --service-name
+ - {{ include "common.mariadbService" . }}
- --job-name
- {{ include "common.fullname" . }}-dbinit-job
{{ end -}}
path: /var/log/onap
readinessCheck:
- wait_for_global_operator:
- pods:
- - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
- wait_for_local_operator:
- pods:
- - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
- wait_for_global:
- apps:
- - '{{ include "common.mariadbAppName" . }}'
- wait_for_local:
- apps:
- - '{{ include "common.mariadbAppName" . }}'
+ wait_for:
+ services:
+ - '{{ include "common.mariadbService" . }}'
nodePortPrefix: 302
nodePortPrefixExt: 304
repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
envsubstImage: dibi/envsubst
persistence:
mountPath: /dockerdata-nfs
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
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 }}
containers:
- name: {{ include "common.name" . }}-config
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
nodePortPrefix: 302
nodePortPrefixExt: 304
repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:6.0.2
+ readinessImage: onap/oom/readiness:6.0.3
ubuntuInitRepository: docker.io
mariadbGalera:
# flag to enable the DB creation via mariadb-operator
- '{{ include "common.name" . }}-config'
readinessCheck:
- wait_for_global_operator:
- pods:
- - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
- wait_for_local_operator:
- pods:
- - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
- wait_for_global:
- apps:
- - '{{ include "common.mariadbAppName" . }}'
- wait_for_local:
- apps:
- - '{{ include "common.mariadbAppName" . }}'
+ wait_for:
+ services:
+ - '{{ include "common.mariadbService" . }}'
readinessCheck:
wait_for:
- - aai
- - message-router
+ services:
+ - aai
+ - message-router
#################################################################
# Application configuration defaults.
- command:
- /app/ready.py
args:
- - --container-name
- - "{{ .Values.postgres.nameOverride }}"
+ - --service-name
+ - "{{ .Values.postgres.service.name2 }}"
env:
- name: NAMESPACE
valueFrom:
readinessCheck:
wait_for:
- containers:
- - *postgresName
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
wait_for_job_container:
containers:
- command:
- /app/ready.py
args:
- - --container-name
- - "{{ .Values.postgres.nameOverride }}"
+ - --service-name
+ - "{{ .Values.postgres.service.name2 }}"
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --container-name
- - "{{ .Values.postgres.nameOverride }}"
+ - --service-name
+ - "{{ .Values.postgres.service.name2 }}"
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --app-name
- - {{ include "common.mariadbAppName" . }}
+ - --service-name
+ - {{ include "common.mariadbService" . }}
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --app-name
- - {{ include "common.mariadbAppName" . }}
+ - --service-name
+ - {{ include "common.mariadbService" . }}
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --app-name
- - {{ include "common.mariadbAppName" . }}
+ - --service-name
+ - {{ include "common.mariadbService" . }}
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --app-name
- - {{ include "common.mariadbAppName" . }}
+ - --service-name
+ - {{ include "common.mariadbService" . }}
env:
- name: NAMESPACE
valueFrom:
- command:
- /app/ready.py
args:
- - --container-name
- - "{{ .Values.postgres.nameOverride }}"
+ - --service-name
+ - "{{ .Values.postgres.service.name2 }}"
env:
- name: NAMESPACE
valueFrom:
readinessCheck:
wait_for:
- - '{{ .Values.postgres.nameOverride }}'
+ services:
+ - '{{ .Values.postgres.service.name2 }}'
wait_for_job_container:
containers: