aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-26 10:01:18 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-26 10:01:18 +0000
commita18e6f219d98a7b13ffd29d15c0345dce8ea2464 (patch)
tree58a568e480d1d24a7ecdc0b910a6d0257982e961 /kubernetes
parent9ad94aaf081f1fe5b69cc4bea9d90577dd07aa17 (diff)
parent99baf8e526d5a2019a7dadf82446e1303afc86e4 (diff)
Merge "[DCAEMOD] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml6
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/values.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml4
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-genprocessor/templates/deployment.yaml6
-rw-r--r--kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-healthcheck/values.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml4
-rw-r--r--kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-onboarding-api/templates/deployment.yaml4
-rw-r--r--kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml2
-rw-r--r--kubernetes/dcaemod/values.yaml4
22 files changed, 35 insertions, 33 deletions
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
index c84ca79fd9..627dc59e81 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml
index 2929b56bc6..bd2766f6db 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
spec:
initContainers:
- 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
@@ -48,7 +48,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-create-bucket
- image: {{ .Values.config.curlImage }}
+ image: {{ include "repositoryGenerator.image.curl" . }}
args:
- -kv
- -X
@@ -61,7 +61,7 @@ spec:
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: {{ include "common.containerPorts" . | nindent 12 }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
index 5be8cacefd..3daca28476 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
@@ -22,7 +22,6 @@ global:
persistence: {}
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
ingress:
enabled: true
@@ -32,10 +31,8 @@ global:
config:
nifiJarsIndexURL: http://dcaemod-genprocessor:8080/nifi-jars
distributorAPIURL: /distributor
- curlImage: curlimages/curl:7.68.0
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.mod.designtool-web:1.0.2
service:
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
index df3df964cb..51543cf310 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml
index e21efd1f87..696b43a536 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
spec:
initContainers:
- 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
@@ -49,7 +49,7 @@ spec:
fieldPath: metadata.namespace
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: {{ include "common.containerPorts" . | nindent 12 }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
index c717ca3309..274edcd4a3 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
@@ -22,7 +22,6 @@ global:
persistence: {}
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
ingress:
enabled: true
@@ -34,7 +33,6 @@ config:
onboardingAPIURL: http://dcaemod-onboarding-api:8080/onboarding
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.mod.distributorapi:1.1.0
service:
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
index df3df964cb..51543cf310 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/templates/deployment.yaml
index 0c1501233d..40b0f3edc4 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
# this initContainer changes ownership to uid 1000 gid 1000
# (tried using a securityContext in the pod spec, but it didn't seem to work)
- name: set-permissions
- image: busybox:latest
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- sh
@@ -43,7 +43,7 @@ spec:
name: genprocessor-data
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: {{ include "common.containerPorts" . | nindent 12 }}
{{- if eq .Values.liveness.enabled true }}
@@ -66,7 +66,7 @@ spec:
name: genprocessor-data
resources: {{ include "common.resources" . | nindent 12 }}
- name: {{ include "common.name" . }}-http
- image: "{{ include "common.repository" . }}/{{ .Values.httpImage }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.httpImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /www/data
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
index 92633acf97..45ae96f2d2 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
@@ -22,7 +22,6 @@ global:
persistence: {}
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
ingress:
enabled: true
virtualhost:
@@ -32,7 +31,6 @@ config:
onboardingAPIURL: http://dcaemod-onboarding-api:8080/onboarding
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.mod.genprocessor-job:1.0.2
httpImage: onap/org.onap.dcaegen2.platform.mod.genprocessor-http:1.0.2
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
index 6f858bda03..45dddcfbd1 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
@@ -20,3 +20,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml
index d5314645a5..0eaa2296bb 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
{{ include "common.resources" . | indent 12 }}
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/values.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/values.yaml
index 578a78d569..356149c0dd 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/values.yaml
@@ -21,7 +21,6 @@
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
service:
name: dcaemod-healthcheck
@@ -42,7 +41,6 @@ readiness:
initialDelaySeconds: 10
periodSeconds: 10
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.0.0
# Resource Limit flavor -By Default using small
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
index df3df964cb..51543cf310 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml
index d601d92b41..90561ac231 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
# this initContainer changes ownership to uid 1000 gid 1000
# (tried using a securityContext in the pod spec, but it didn't seem to work)
- name: set-permissions
- image: busybox:latest
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- sh
@@ -43,7 +43,7 @@ spec:
name: flow-storage
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 12 }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml
index 02028f5117..25b3b9e318 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml
@@ -22,7 +22,6 @@ global:
persistence: {}
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
config:
dbURL: jdbc:h2:./database/nifi-registry-primary
@@ -37,7 +36,6 @@ secrets:
passwordPolicy: generate
# application image
-repository: docker.io
image: apache/nifi-registry:0.5.0
service:
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
index 038e976319..7e71a401ab 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
@@ -22,3 +22,6 @@ dependencies:
- name: postgres
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/templates/deployment.yaml
index 9e811a9e84..b795f6b736 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
spec:
initContainers:
- 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
@@ -50,7 +50,7 @@ spec:
args:
- -c
- 'PG_CONN=postgresql://${PG_USER}:${PG_PASSWORD}@${PG_ADDR}:${PG_PORT}/${PG_DB_NAME} ./start.sh'
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 12 }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
index 161b3621a0..42fe9d8f56 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
@@ -21,7 +21,6 @@
global:
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
ingress:
enabled: true
virtualhost:
@@ -91,7 +90,6 @@ postgres:
mountInitPath: dcaemod
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.mod.onboardingapi:2.12.3
# Resource Limit flavor -By Default using small
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
index 444eb8ac2a..f3a02ca58a 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
@@ -19,4 +19,7 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
index 7c9375339e..735b0281be 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
spec:
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: {{ include "common.containerPorts" . | nindent 12 }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
index 2d136c8324..32d651f749 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
@@ -21,7 +21,6 @@
global:
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
config:
dashboardURL: https://inventory:8080/dcae-service-types
@@ -70,7 +69,6 @@ readiness:
# Should have a proper readiness endpoint or script
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.1.1
# Resource Limit flavor -By Default using small
diff --git a/kubernetes/dcaemod/values.yaml b/kubernetes/dcaemod/values.yaml
index 6c1dff5b3d..57e6d32693 100644
--- a/kubernetes/dcaemod/values.yaml
+++ b/kubernetes/dcaemod/values.yaml
@@ -17,10 +17,6 @@
#################################################################
global:
nodePortPrefix: 302
- tlsRepository: nexus3.onap.org:10001
- tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.30
# Enable all DCAE MOD components by default
dcaemod-designtool: