From 8cd9447dfb6463f1f9229ce63a3f5aea30f6fe3b Mon Sep 17 00:00:00 2001 From: Julien Barbot Date: Tue, 23 Oct 2018 12:15:31 +0200 Subject: Consistent naming for vid deployment Change-Id: I7ae002ae214f1c0ca858a96c79e2b74f15d13405 Issue-ID: OOM-729 Signed-off-by: Julien Barbot --- kubernetes/vid/templates/deployment.yaml | 2 +- kubernetes/vid/templates/job.yaml | 83 ++++++++++++++++++++++ .../vid/templates/vid-galera-config-job.yaml | 83 ---------------------- 3 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 kubernetes/vid/templates/job.yaml delete mode 100644 kubernetes/vid/templates/vid-galera-config-job.yaml diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml index 4c635facd2..24cce14f8d 100644 --- a/kubernetes/vid/templates/deployment.yaml +++ b/kubernetes/vid/templates/deployment.yaml @@ -35,7 +35,7 @@ spec: - /root/job_complete.py args: - --job-name - - vid-config-galera + - {{ include "common.fullname" . }}-galera-config env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/vid/templates/job.yaml b/kubernetes/vid/templates/job.yaml new file mode 100644 index 0000000000..7d17e36f4e --- /dev/null +++ b/kubernetes/vid/templates/job.yaml @@ -0,0 +1,83 @@ +# Copyright © 2018 Amdocs, Bell Canada +# +# 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: batch/v1 +kind: Job +metadata: + name: {{ include "common.fullname" . }}-galera-config + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }}-job + release: {{ .Release.Name }} +spec: + template: + metadata: + labels: + app: {{ include "common.name" . }}-job + release: {{ .Release.Name }} + spec: + initContainers: +#This container checks that all galera instances are up before initializing it. + - name: {{ include "common.name" . }}-readiness + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + command: + - /root/ready.py +{{- $fullname := include "common.fullname" . -}} +{{- range $i,$t := until (int .Values.vid_mariadb_galera.replicaCount)}} + - --container-name + - {{ $fullname }}-mariadb-galera-{{$i}} +{{- end }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + containers: + - name: {{ include "common.name" . }}-job + image: {{ .Values.mariadb_image }} + imagePullPolicy: "{{ .Values.pullPolicy }}" + volumeMounts: + - mountPath: /dbcmd-config/db_cmd.sh + name: {{ include "common.fullname" . }}-config + subPath: db_cmd.sh + - mountPath: /db-config/vid-pre-init.sql + name: {{ include "common.fullname" . }}-config + subPath: vid-pre-init.sql + command: + - /bin/sh + args: + - -x + - /dbcmd-config/db_cmd.sh + env: + - name: MYSQL_PASSWORD + value: "{{ .Values.config.vidmysqlpassword }}" + - name: MYSQL_HOST + value: "{{ .Values.config.vidmysqlhost }}" + - name: MYSQL_USER + value: "{{ .Values.config.vidmysqluser }}" + - name: MYSQL_PORT + value: "{{ .Values.config.vidmysqlport }}" + restartPolicy: Never + volumes: + - name: {{ include "common.fullname" . }}-config + configMap: + name: {{ include "common.fullname" . }} + items: + - key: db_cmd.sh + path: db_cmd.sh + - key: vid-pre-init.sql + path: vid-pre-init.sql + diff --git a/kubernetes/vid/templates/vid-galera-config-job.yaml b/kubernetes/vid/templates/vid-galera-config-job.yaml deleted file mode 100644 index 2bcf64749d..0000000000 --- a/kubernetes/vid/templates/vid-galera-config-job.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada -# -# 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: batch/v1 -kind: Job -metadata: - name: vid-config-galera - namespace: {{ include "common.namespace" . }} - labels: - app: vid-config-galera - release: {{ .Release.Name }} -spec: - template: - metadata: - labels: - release: {{ .Release.Name }} - name: vid-galera-init - spec: - initContainers: -#This container checks that all galera instances are up before initializing it. - - name: vid-init-galera-readiness - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - command: - - /root/ready.py -{{- $fullname := include "common.fullname" . -}} -{{- range $i,$t := until (int .Values.vid_mariadb_galera.replicaCount)}} - - --container-name - - {{ $fullname }}-mariadb-galera-{{$i}} -{{- end }} - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - containers: - - name: vid-config-galeradb - image: {{ .Values.mariadb_image }} - imagePullPolicy: "{{ .Values.pullPolicy }}" - volumeMounts: - - mountPath: /dbcmd-config/db_cmd.sh - name: {{ include "common.fullname" . }}-config - subPath: db_cmd.sh - - mountPath: /db-config/vid-pre-init.sql - name: {{ include "common.fullname" . }}-config - subPath: vid-pre-init.sql - command: - - /bin/sh - args: - - -x - - /dbcmd-config/db_cmd.sh - env: - - name: MYSQL_PASSWORD - value: "{{ .Values.config.vidmysqlpassword }}" - - name: MYSQL_HOST - value: "{{ .Values.config.vidmysqlhost }}" - - name: MYSQL_USER - value: "{{ .Values.config.vidmysqluser }}" - - name: MYSQL_PORT - value: "{{ .Values.config.vidmysqlport }}" - restartPolicy: Never - volumes: - - name: {{ include "common.fullname" . }}-config - configMap: - name: {{ include "common.fullname" . }} - items: - - key: db_cmd.sh - path: db_cmd.sh - - key: vid-pre-init.sql - path: vid-pre-init.sql - -- cgit 1.2.3-korg