summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/charts/so-mariadb/templates/job.yaml
diff options
context:
space:
mode:
authorTomáš Levora <t.levora@partner.samsung.com>2019-09-20 08:16:54 +0200
committerTomáš Levora <t.levora@partner.samsung.com>2019-10-11 07:38:56 +0000
commitf32146e04e9a94df466548fb0c8b5017351c5d04 (patch)
treea63966f2c8055d12fa70993d32157b1756e146ca /kubernetes/so/charts/so-mariadb/templates/job.yaml
parent86fb8fe24ce03d725a67a30f9b255ec37d7aba45 (diff)
Remove docker-config runtime internet dependency
Adding orginally downloaded resources directly to pod volumes Issue-ID: SO-1917 Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com> Change-Id: I7edf86e625e50987cea3a3c502eb391672f958f5 (cherry picked from commit 2a63ef35a9c86bfe798771d4bda76dfd6ec07c69)
Diffstat (limited to 'kubernetes/so/charts/so-mariadb/templates/job.yaml')
-rw-r--r--[-rwxr-xr-x]kubernetes/so/charts/so-mariadb/templates/job.yaml27
1 files changed, 9 insertions, 18 deletions
diff --git a/kubernetes/so/charts/so-mariadb/templates/job.yaml b/kubernetes/so/charts/so-mariadb/templates/job.yaml
index a20564e513..7e10e48945 100755..100644
--- a/kubernetes/so/charts/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/job.yaml
@@ -111,21 +111,6 @@ spec:
fieldPath: metadata.namespace
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- - name: {{ include "common.name" . }}-inject-testlab-project
- command:
- - /bin/bash
- - -c
- - >
- git clone -b {{ .Values.config.gerritBranch }} --single-branch {{ .Values.config.gerritProject }} /tmp/gerrit;
- echo "Clone complete. Copying from /tmp/gerrit/volumes/mariadb/docker-entrypoint-initdb.d to /docker-entrypoint-initdb.d";
- cp -rf /tmp/gerrit/volumes/mariadb/docker-entrypoint-initdb.d/* /docker-entrypoint-initdb.d;
- chmod -R 755 /docker-entrypoint-initdb.d;
- echo "Done.";
- image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.ubuntuInitImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: docker-entrypoint-initdb-d
- mountPath: "/docker-entrypoint-initdb.d"
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -161,8 +146,10 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - name: docker-entrypoint-initdb-d
+ - name: docker-entrypoint-initdb-d-sh
mountPath: "/docker-entrypoint-initdb.d"
+ - name: docker-entrypoint-initdb-d-sql
+ mountPath: "/docker-entrypoint-initdb.d/db-sql-scripts"
{{- if .Values.global.migration.enabled }}
- name: backup-storage
mountPath: /var/data/mariadb
@@ -181,8 +168,12 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: docker-entrypoint-initdb-d
- emptyDir: {}
+ - name: docker-entrypoint-initdb-d-sh
+ configMap:
+ name: {{ include "common.fullname" . }}-mariadb-sh
+ - name: docker-entrypoint-initdb-d-sql
+ configMap:
+ name: {{ include "common.fullname" . }}-mariadb-sql
{{- if .Values.global.migration.enabled }}
- name: backup-storage
persistentVolumeClaim: