diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-19 17:20:58 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-27 14:16:05 +0000 |
| commit | 415cdee6e3e5ef50efccabbd370b56eb07139914 (patch) | |
| tree | bde98c275610a29694547a5738c9d356ff55fa70 /kubernetes/common | |
| parent | a6fa6b1fe4c8c9b8e2a3e29b364dc96804404a9c (diff) | |
[COMMON][NAMEGEN] Uses new tpls for repos / images
This commit makes network name gen 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: I9f638f1fe48d6cdb66cc53cc9bcedb67edb55017
Diffstat (limited to 'kubernetes/common')
| -rw-r--r-- | kubernetes/common/network-name-gen/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/common/network-name-gen/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/common/network-name-gen/values.yaml | 8 |
3 files changed, 5 insertions, 10 deletions
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml index 8c2277c210..63e13308e9 100644 --- a/kubernetes/common/network-name-gen/requirements.yaml +++ b/kubernetes/common/network-name-gen/requirements.yaml @@ -16,6 +16,9 @@ dependencies: - name: common
version: ~6.x-0
repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: 'file://../repositoryGenerator'
- name: mariadb-galera
version: ~6.x-0
repository: 'file://../mariadb-galera'
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml index c97c0488ac..16d93c6ed3 100644 --- a/kubernetes/common/network-name-gen/templates/deployment.yaml +++ b/kubernetes/common/network-name-gen/templates/deployment.yaml @@ -53,7 +53,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} containers: - name: {{ include "common.name" . }} @@ -62,7 +62,7 @@ spec: args: - '-c' - 'export POL_BASIC_AUTH=`echo -n $POL_BASIC_AUTH_USER:$POL_BASIC_AUTH_PASSWORD | base64`; /startService.sh' - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: SPRING_PROFILE diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index ade8a20df6..d38d6e25cd 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -21,13 +21,6 @@ global: # with other instances running within the same k8s cluster nodePortPrefix: 302 - # image repositories - repository: nexus3.onap.org:10001 - - - # readiness check - readinessImage: onap/oom/readiness:3.0.1 - # image pull policy pullPolicy: IfNotPresent @@ -77,7 +70,6 @@ mariadb-init: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/ccsdk-apps-ms-neng:1.0.2 pullPolicy: IfNotPresent |