aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-mariadb
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/so/components/so-mariadb')
-rwxr-xr-xkubernetes/so/components/so-mariadb/Chart.yaml3
-rw-r--r--kubernetes/so/components/so-mariadb/templates/job.yaml16
-rwxr-xr-xkubernetes/so/components/so-mariadb/values.yaml18
3 files changed, 27 insertions, 10 deletions
diff --git a/kubernetes/so/components/so-mariadb/Chart.yaml b/kubernetes/so/components/so-mariadb/Chart.yaml
index f66f740b34..cb82906ad1 100755
--- a/kubernetes/so/components/so-mariadb/Chart.yaml
+++ b/kubernetes/so/components/so-mariadb/Chart.yaml
@@ -28,9 +28,6 @@ dependencies:
- name: repositoryGenerator
version: ~13.x-0
repository: '@local'
- - name: readinessCheck
- version: ~13.x-0
- repository: '@local'
- name: serviceAccount
version: ~13.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index 7be44c4201..0afe02ada7 100644
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -101,7 +101,21 @@ spec:
release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
spec:
- initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
+ initContainers:
+ - name: {{ include "common.name" . }}-readiness
+ command:
+ - /app/ready.py
+ args:
+ - --app-name
+ - {{ include "common.mariadbAppName" . }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ include "repositoryGenerator.image.readiness" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
containers:
- name: {{ include "common.name" . }}-config
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index 4aa322934b..8b29e622fb 100755
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -25,7 +25,9 @@ global:
readinessImage: onap/oom/readiness:5.0.1
ubuntuInitRepository: docker.io
mariadbGalera:
- nameOverride: &mariadbName mariadb-galera
+ # flag to enable the DB creation via mariadb-operator
+ useOperator: true
+ nameOverride: mariadb-galera
service: mariadb-galera
servicePort: "3306"
migration:
@@ -35,11 +37,6 @@ global:
dbUser: root
dbPassword: secretpassword
-readinessCheck:
- wait_for:
- apps:
- - *mariadbName
-
#################################################################
# Secrets metaconfig
#################################################################
@@ -106,6 +103,15 @@ image: mariadb:10.1.38
pullPolicy: Always
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+# Local mariadb galera instance default name
+mariadb-galera:
+ nameOverride: so-mariadb-galera
+ service:
+ internalPort: 3306
+ mariadbOperator:
+ galera:
+ enabled: false
+
# db config
db:
rootPassword: secretpassword