aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-23 11:21:23 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-23 11:21:23 +0000
commit37ff8414e2a492addb19a6bdedde4e76c768edd3 (patch)
tree7718254706a88139a780cdc6a8c6c5aefb616c55 /kubernetes
parentb6b8feb8263bc859d48640033087b38f295dfeb8 (diff)
parent585dd9dd7c02c76745cc7f3ec8a78b9fb0fc352b (diff)
Merge "[PORTAL] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/portal/components/portal-app/requirements.yaml3
-rw-r--r--kubernetes/portal/components/portal-app/templates/deployment.yaml8
-rw-r--r--kubernetes/portal/components/portal-app/values.yaml5
-rw-r--r--kubernetes/portal/components/portal-cassandra/requirements.yaml3
-rw-r--r--kubernetes/portal/components/portal-cassandra/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/components/portal-cassandra/values.yaml1
-rw-r--r--kubernetes/portal/components/portal-mariadb/requirements.yaml3
-rw-r--r--kubernetes/portal/components/portal-mariadb/templates/deployment.yaml4
-rw-r--r--kubernetes/portal/components/portal-mariadb/templates/job.yaml6
-rw-r--r--kubernetes/portal/components/portal-mariadb/values.yaml8
-rw-r--r--kubernetes/portal/components/portal-sdk/requirements.yaml3
-rw-r--r--kubernetes/portal/components/portal-sdk/templates/deployment.yaml8
-rw-r--r--kubernetes/portal/components/portal-sdk/values.yaml5
-rw-r--r--kubernetes/portal/components/portal-widget/requirements.yaml3
-rw-r--r--kubernetes/portal/components/portal-widget/templates/deployment.yaml6
-rw-r--r--kubernetes/portal/components/portal-widget/values.yaml6
16 files changed, 33 insertions, 41 deletions
diff --git a/kubernetes/portal/components/portal-app/requirements.yaml b/kubernetes/portal/components/portal-app/requirements.yaml
index 00b92235f3..bfcaecb7aa 100644
--- a/kubernetes/portal/components/portal-app/requirements.yaml
+++ b/kubernetes/portal/components/portal-app/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-app/templates/deployment.yaml b/kubernetes/portal/components/portal-app/templates/deployment.yaml
index 068a0af3c2..71b2aa3227 100644
--- a/kubernetes/portal/components/portal-app/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-app/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
spec:
initContainers:
- name: {{ include "common.name" . }}-job-completion
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
command:
- /app/ready.py
@@ -52,7 +52,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-portal-config
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- sh
@@ -90,7 +90,7 @@ spec:
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c"]
{{- if .Values.global.aafEnabled }}
@@ -170,7 +170,7 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- name: filebeat-onap
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
diff --git a/kubernetes/portal/components/portal-app/values.yaml b/kubernetes/portal/components/portal-app/values.yaml
index 01d4261bdf..0a818102c6 100644
--- a/kubernetes/portal/components/portal-app/values.yaml
+++ b/kubernetes/portal/components/portal-app/values.yaml
@@ -20,10 +20,6 @@ global:
env:
tomcatDir: "/usr/local/tomcat"
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- envsubstImage: dibi/envsubst
#AAF service
aafEnabled: true
@@ -55,7 +51,6 @@ secrets:
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/portal-app:3.4.2
pullPolicy: Always
diff --git a/kubernetes/portal/components/portal-cassandra/requirements.yaml b/kubernetes/portal/components/portal-cassandra/requirements.yaml
index c5d7864b9d..7c92350367 100644
--- a/kubernetes/portal/components/portal-cassandra/requirements.yaml
+++ b/kubernetes/portal/components/portal-cassandra/requirements.yaml
@@ -16,3 +16,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/components/portal-cassandra/templates/deployment.yaml
index c1b49da31a..80197a6094 100644
--- a/kubernetes/portal/components/portal-cassandra/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-cassandra/templates/deployment.yaml
@@ -38,7 +38,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:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/components/portal-cassandra/values.yaml b/kubernetes/portal/components/portal-cassandra/values.yaml
index eb6fc12274..a0488e5cc7 100644
--- a/kubernetes/portal/components/portal-cassandra/values.yaml
+++ b/kubernetes/portal/components/portal-cassandra/values.yaml
@@ -22,7 +22,6 @@ global: # global defaults
# application image
-repository: nexus3.onap.org:10001
image: onap/music/cassandra_music:3.0.0
pullPolicy: Always
diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml
index c5d7864b9d..7c92350367 100644
--- a/kubernetes/portal/components/portal-mariadb/requirements.yaml
+++ b/kubernetes/portal/components/portal-mariadb/requirements.yaml
@@ -16,3 +16,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml b/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml
index 250335f0ce..7e94c76896 100644
--- a/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml
@@ -38,14 +38,14 @@ spec:
spec:
initContainers:
- name: volume-permissions
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
command: ['sh', '-c', 'chmod -R 777 /var/lib/mysql']
volumeMounts:
- mountPath: /var/lib/mysql
name: mariadb-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:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/components/portal-mariadb/templates/job.yaml b/kubernetes/portal/components/portal-mariadb/templates/job.yaml
index 920ee73169..5a66bb96bd 100644
--- a/kubernetes/portal/components/portal-mariadb/templates/job.yaml
+++ b/kubernetes/portal/components/portal-mariadb/templates/job.yaml
@@ -35,7 +35,7 @@ spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-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:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-job
- image: "{{ include "common.repository" . }}/{{ .Values.mariadbInitImage }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
@@ -63,7 +63,7 @@ spec:
- name: SQL_SRC_DIR
value: {{ .Values.config.sqlSourceDirectory }}
- name: {{ include "common.name" . }}-oom-update-job
- image: "{{ include "common.repository" . }}/{{ .Values.mariadbInitImage }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DB_HOST
diff --git a/kubernetes/portal/components/portal-mariadb/values.yaml b/kubernetes/portal/components/portal-mariadb/values.yaml
index 5061593739..99dda390b4 100644
--- a/kubernetes/portal/components/portal-mariadb/values.yaml
+++ b/kubernetes/portal/components/portal-mariadb/values.yaml
@@ -19,17 +19,11 @@
global: # global defaults
nodePortPrefix: 302
persistence: {}
- readinessImage: onap/oom/readiness:3.0.1
- busyBoxImage: busybox:1.30
- busyBoxRepository: docker.io
# application image
-repository: nexus3.onap.org:10001
image: onap/portal-db:3.4.1
pullPolicy: Always
-
-
-mariadbInitImage: "oomk8s/mariadb-client-init:3.0.0"
+mariadbInitImage: oomk8s/mariadb-client-init:3.0.0
# application configuration
config:
diff --git a/kubernetes/portal/components/portal-sdk/requirements.yaml b/kubernetes/portal/components/portal-sdk/requirements.yaml
index 00b92235f3..bfcaecb7aa 100644
--- a/kubernetes/portal/components/portal-sdk/requirements.yaml
+++ b/kubernetes/portal/components/portal-sdk/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-sdk/templates/deployment.yaml b/kubernetes/portal/components/portal-sdk/templates/deployment.yaml
index 75427d1093..95247b3dd2 100644
--- a/kubernetes/portal/components/portal-sdk/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-sdk/templates/deployment.yaml
@@ -38,7 +38,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
@@ -52,7 +52,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-portalsdk-config
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- sh
@@ -90,7 +90,7 @@ spec:
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c"]
{{- if .Values.global.aafEnabled }}
@@ -161,7 +161,7 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- name: filebeat-onap
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
diff --git a/kubernetes/portal/components/portal-sdk/values.yaml b/kubernetes/portal/components/portal-sdk/values.yaml
index dc27aaeb92..11ce5a6e42 100644
--- a/kubernetes/portal/components/portal-sdk/values.yaml
+++ b/kubernetes/portal/components/portal-sdk/values.yaml
@@ -20,11 +20,7 @@ global:
env:
tomcatDir: "/usr/local/tomcat"
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
persistence: {}
- envsubstImage: dibi/envsubst
#AAF service
aafEnabled: true
@@ -56,7 +52,6 @@ secrets:
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/portal-sdk:3.4.2
pullPolicy: Always
diff --git a/kubernetes/portal/components/portal-widget/requirements.yaml b/kubernetes/portal/components/portal-widget/requirements.yaml
index c5d7864b9d..7c92350367 100644
--- a/kubernetes/portal/components/portal-widget/requirements.yaml
+++ b/kubernetes/portal/components/portal-widget/requirements.yaml
@@ -16,3 +16,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-widget/templates/deployment.yaml b/kubernetes/portal/components/portal-widget/templates/deployment.yaml
index eb6fc9eeee..246257651a 100644
--- a/kubernetes/portal/components/portal-widget/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-widget/templates/deployment.yaml
@@ -38,7 +38,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
@@ -52,7 +52,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-portal-widget-config
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- sh
@@ -87,7 +87,7 @@ spec:
name: properties-onapwidgetms
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /start-wms.sh
diff --git a/kubernetes/portal/components/portal-widget/values.yaml b/kubernetes/portal/components/portal-widget/values.yaml
index f1fddde824..f86ff85f75 100644
--- a/kubernetes/portal/components/portal-widget/values.yaml
+++ b/kubernetes/portal/components/portal-widget/values.yaml
@@ -18,11 +18,6 @@
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- ubuntuInit: ubuntu-init:1.0.0
- envsubstImage: dibi/envsubst
################################################################
# Secrets metaconfig
@@ -67,7 +62,6 @@ config:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/portal-wms:3.4.2
pullPolicy: Always