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
- name: common\r
version: ~6.x-0\r
repository: 'file://../common'\r
- name: common\r
version: ~6.x-0\r
repository: 'file://../common'\r
+ - name: repositoryGenerator\r
+ version: ~6.x-0\r
+ repository: 'file://../repositoryGenerator'\r
- name: mariadb-galera\r
version: ~6.x-0\r
repository: 'file://../mariadb-galera'\r
- name: mariadb-galera\r
version: ~6.x-0\r
repository: 'file://../mariadb-galera'\r
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
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" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
containers:
- name: {{ include "common.name" . }}
args:
- '-c'
- 'export POL_BASIC_AUTH=`echo -n $POL_BASIC_AUTH_USER:$POL_BASIC_AUTH_PASSWORD | base64`; /startService.sh'
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
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: SPRING_PROFILE
# with other instances running within the same k8s cluster
nodePortPrefix: 302
# 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
# image pull policy
pullPolicy: IfNotPresent
# Application configuration defaults.
#################################################################
# application image
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/ccsdk-apps-ms-neng:1.0.2
pullPolicy: IfNotPresent
image: onap/ccsdk-apps-ms-neng:1.0.2
pullPolicy: IfNotPresent