summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-23 11:26:35 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-23 11:26:35 +0000
commit38b642443281162cc4c9d709d5ab523646adb678 (patch)
tree4344ed7967c3fcbca27f59be98ffb8f957669147 /kubernetes
parent37ff8414e2a492addb19a6bdedde4e76c768edd3 (diff)
parent6027f260b4d7e161c5b6866c285a451bc253ccc1 (diff)
Merge "[HELM] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/helm/starters/onap-app/requirements.yaml3
-rw-r--r--kubernetes/helm/starters/onap-app/templates/deployment.yaml4
-rw-r--r--kubernetes/helm/starters/onap-app/values.yaml5
3 files changed, 5 insertions, 7 deletions
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml
index 6a61926e9e..b8e59b0910 100644
--- a/kubernetes/helm/starters/onap-app/requirements.yaml
+++ b/kubernetes/helm/starters/onap-app/requirements.yaml
@@ -15,4 +15,7 @@
dependencies:
- name: common
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/helm/starters/onap-app/templates/deployment.yaml b/kubernetes/helm/starters/onap-app/templates/deployment.yaml
index b409781c5e..fc76c1ff6d 100644
--- a/kubernetes/helm/starters/onap-app/templates/deployment.yaml
+++ b/kubernetes/helm/starters/onap-app/templates/deployment.yaml
@@ -43,12 +43,12 @@ 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 }}
# name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/helm/starters/onap-app/values.yaml b/kubernetes/helm/starters/onap-app/values.yaml
index 5bbe8f25d9..702bfb2a73 100644
--- a/kubernetes/helm/starters/onap-app/values.yaml
+++ b/kubernetes/helm/starters/onap-app/values.yaml
@@ -17,16 +17,11 @@
#################################################################
global:
nodePortPrefix: 302
- repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: <onap-app>:<1.2-STAGING-latest>
pullPolicy: Always