summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/components/portal-mariadb
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/portal/components/portal-mariadb')
-rw-r--r--kubernetes/portal/components/portal-mariadb/requirements.yaml3
-rw-r--r--kubernetes/portal/components/portal-mariadb/templates/deployment.yaml4
-rw-r--r--kubernetes/portal/components/portal-mariadb/templates/job.yaml6
-rw-r--r--kubernetes/portal/components/portal-mariadb/values.yaml8
4 files changed, 9 insertions, 12 deletions
diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml
index c5d7864b9d..7c92350367 100644
--- a/kubernetes/portal/components/portal-mariadb/requirements.yaml
+++ b/kubernetes/portal/components/portal-mariadb/requirements.yaml
@@ -16,3 +16,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml b/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml
index 250335f0ce..7e94c76896 100644
--- a/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml
@@ -38,14 +38,14 @@ spec:
spec:
initContainers:
- name: volume-permissions
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
command: ['sh', '-c', 'chmod -R 777 /var/lib/mysql']
volumeMounts:
- mountPath: /var/lib/mysql
name: mariadb-data
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/components/portal-mariadb/templates/job.yaml b/kubernetes/portal/components/portal-mariadb/templates/job.yaml
index 920ee73169..5a66bb96bd 100644
--- a/kubernetes/portal/components/portal-mariadb/templates/job.yaml
+++ b/kubernetes/portal/components/portal-mariadb/templates/job.yaml
@@ -35,7 +35,7 @@ spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -50,7 +50,7 @@ spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-job
- image: "{{ include "common.repository" . }}/{{ .Values.mariadbInitImage }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
@@ -63,7 +63,7 @@ spec:
- name: SQL_SRC_DIR
value: {{ .Values.config.sqlSourceDirectory }}
- name: {{ include "common.name" . }}-oom-update-job
- image: "{{ include "common.repository" . }}/{{ .Values.mariadbInitImage }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
diff --git a/kubernetes/portal/components/portal-mariadb/values.yaml b/kubernetes/portal/components/portal-mariadb/values.yaml
index 5061593739..99dda390b4 100644
--- a/kubernetes/portal/components/portal-mariadb/values.yaml
+++ b/kubernetes/portal/components/portal-mariadb/values.yaml
@@ -19,17 +19,11 @@
global: # global defaults
nodePortPrefix: 302
persistence: {}
- readinessImage: onap/oom/readiness:3.0.1
- busyBoxImage: busybox:1.30
- busyBoxRepository: docker.io
# application image
-repository: nexus3.onap.org:10001
image: onap/portal-db:3.4.1
pullPolicy: Always
-
-
-mariadbInitImage: "oomk8s/mariadb-client-init:3.0.0"
+mariadbInitImage: oomk8s/mariadb-client-init:3.0.0
# application configuration
config: