summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-30 08:27:34 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-30 08:27:34 +0000
commit8078860750eeb57c94758440492d2341241a6d53 (patch)
tree9c35836c8852994935f4ac4690ddb689a1a64bfc
parent5f87538137c882aa6a4064faf1ba1d10efc07ce0 (diff)
parent415cdee6e3e5ef50efccabbd370b56eb07139914 (diff)
Merge "[COMMON][NAMEGEN] Uses new tpls for repos / images"
-rw-r--r--kubernetes/common/network-name-gen/requirements.yaml3
-rw-r--r--kubernetes/common/network-name-gen/templates/deployment.yaml4
-rw-r--r--kubernetes/common/network-name-gen/values.yaml8
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