summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/charts/so-mariadb/templates
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-10 10:49:13 +0200
commit2a63ef35a9c86bfe798771d4bda76dfd6ec07c69 (patch)
tree1fd4f57f6a609f185ae417ad32b28e2f61b72b99 /kubernetes/so/charts/so-mariadb/templates
parent55b95ec89e68c41614730a61b491967bdcbf7ffe (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
Diffstat (limited to 'kubernetes/so/charts/so-mariadb/templates')
-rw-r--r--kubernetes/so/charts/so-mariadb/templates/configmap.yaml39
-rw-r--r--[-rwxr-xr-x]kubernetes/so/charts/so-mariadb/templates/job.yaml27
-rw-r--r--[-rwxr-xr-x]kubernetes/so/charts/so-mariadb/templates/pv.yaml0
-rw-r--r--[-rwxr-xr-x]kubernetes/so/charts/so-mariadb/templates/pvc.yaml0
-rw-r--r--[-rwxr-xr-x]kubernetes/so/charts/so-mariadb/templates/secrets.yaml0
5 files changed, 48 insertions, 18 deletions
diff --git a/kubernetes/so/charts/so-mariadb/templates/configmap.yaml b/kubernetes/so/charts/so-mariadb/templates/configmap.yaml
new file mode 100644
index 0000000000..8f10b2eb27
--- /dev/null
+++ b/kubernetes/so/charts/so-mariadb/templates/configmap.yaml
@@ -0,0 +1,39 @@
+# Copyright 2018 © Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-mariadb-sh
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/docker-entrypoint-initdb.d/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-mariadb-sql
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/docker-entrypoint-initdb.d/db-sql-scripts/*").AsConfig . | indent 2 }}
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:
diff --git a/kubernetes/so/charts/so-mariadb/templates/pv.yaml b/kubernetes/so/charts/so-mariadb/templates/pv.yaml
index 5f5d09e2eb..5f5d09e2eb 100755..100644
--- a/kubernetes/so/charts/so-mariadb/templates/pv.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/pv.yaml
diff --git a/kubernetes/so/charts/so-mariadb/templates/pvc.yaml b/kubernetes/so/charts/so-mariadb/templates/pvc.yaml
index 92d5eed0c4..92d5eed0c4 100755..100644
--- a/kubernetes/so/charts/so-mariadb/templates/pvc.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/pvc.yaml
diff --git a/kubernetes/so/charts/so-mariadb/templates/secrets.yaml b/kubernetes/so/charts/so-mariadb/templates/secrets.yaml
index 99ccb55445..99ccb55445 100755..100644
--- a/kubernetes/so/charts/so-mariadb/templates/secrets.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/secrets.yaml