aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 17:23:14 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-24 09:45:23 +0100
commit6a1ae6c27d8ef9e80802654b99e1e6ac239f2a53 (patch)
tree9465be7118f21c435432254e831debd5832f7760 /kubernetes
parent5229ec2ce61bbaf416c746c91254cb39175ff2bc (diff)
[COMMON][POSTGRES] Uses new tpls for repos / images
This commit makes postgreSQL template to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Idac6c4cf2c36e3440d4a7c11bf7ed231d89cdb44
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/common/postgres/requirements.yaml3
-rw-r--r--kubernetes/common/postgres/templates/_deployment.tpl6
-rw-r--r--kubernetes/common/postgres/values.yaml10
3 files changed, 6 insertions, 13 deletions
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
index 6f898b6171..19a4513f52 100644
--- a/kubernetes/common/postgres/requirements.yaml
+++ b/kubernetes/common/postgres/requirements.yaml
@@ -16,3 +16,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl
index 1048811328..6142baa63f 100644
--- a/kubernetes/common/postgres/templates/_deployment.tpl
+++ b/kubernetes/common/postgres/templates/_deployment.tpl
@@ -73,7 +73,7 @@ spec:
subPath: setup.sql
- mountPath: /config
name: pgconf
- image: "{{ $dot.Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" $dot }}
imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $dot.Values.pullPolicy }}
name: {{ include "common.name" $dot }}-update-config
@@ -84,14 +84,14 @@ spec:
- |
chown 26:26 /podroot/;
chmod 700 /podroot/;
- image: {{ $dot.Values.global.busyboxRepository | default $dot.Values.busyboxRepository }}/{{ $dot.Values.busyboxImage }}
+ image: {{ include "repositoryGenerator.image.busybox" $dot }}
imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $dot.Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" $dot }}-data
mountPath: /podroot/
containers:
- name: {{ include "common.name" $dot }}
- image: "{{ $dot.Values.postgresRepository }}/{{ $dot.Values.image }}"
+ image: {{ include "repositoryGenerator.image.postgres" $dot }}
imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $dot.Values.pullPolicy }}
ports:
- containerPort: {{ $dot.Values.service.internalPort }}
diff --git a/kubernetes/common/postgres/values.yaml b/kubernetes/common/postgres/values.yaml
index 34e9d9137a..f815847f06 100644
--- a/kubernetes/common/postgres/values.yaml
+++ b/kubernetes/common/postgres/values.yaml
@@ -18,10 +18,6 @@
global:
nodePortPrefix: 302
persistence: {}
- readinessImage: onap/oom/readiness:3.0.1
-
- # envsusbt
- envsubstImage: dibi/envsubst
#################################################################
# Secrets metaconfig
@@ -45,12 +41,6 @@ secrets:
# Application configuration defaults.
#################################################################
-# BusyBox image
-busyboxRepository: docker.io
-busyboxImage: library/busybox:latest
-
-postgresRepository: crunchydata
-image: crunchy-postgres:centos7-10.11-4.2.1
pullPolicy: Always
# application configuration