aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2/components/dcae-inventory-api
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-inventory-api')
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml4
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml10
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml9
3 files changed, 8 insertions, 15 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
index 653d523472..f841401e7f 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
@@ -20,4 +20,6 @@ dependencies:
- name: postgres
version: ~6.x-0
repository: '@local'
- alias: postgres
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
index 886c3b3803..d25d63c361 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
@@ -54,12 +54,12 @@ spec:
name: {{ include "common.fullname" . }}-inv-config-input
- mountPath: /config
name: {{ include "common.fullname" . }}-inv-config
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
- name: {{ include "common.name" . }}-readiness
- image: {{ include "common.repository" . }}/{{ .Values.global.readinessImage }}
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -85,7 +85,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
- image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.tlsImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources: {}
volumeMounts:
@@ -93,7 +93,7 @@ spec:
name: tls-info
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
# Assumes that the Docker image is built with ENTRYPOINT set to
# ["java", "-jar", "/opt/inventory-api-x.y.z.jar", "server"]
@@ -141,7 +141,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
- image: {{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: IfNotPresent
resources: {}
volumeMounts:
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml
index 3fec537716..7abf0ca745 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml
@@ -20,15 +20,7 @@
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- tlsRepository: nexus3.onap.org:10001
tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
- envsubstImage: dibi/envsubst
- repositoryCred:
- user: docker
- password: docker
secrets:
- uid: pg-user-creds
@@ -52,7 +44,6 @@ config:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.inventory-api:3.5.1
pullPolicy: Always