aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/clamp
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 21:32:40 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 21:34:31 +0100
commitf83984f253ac78cddef1344e986140d9bea6892c (patch)
treea592affe7119b7e393f35185798d55e848f6ffe6 /kubernetes/clamp
parent2b2aa11021114438591d184af19fde6bbf06950a (diff)
[CLAMP] Uses new tpls for repos / images
This commit makes clamp chart to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I5e266d3adaecc1cb65c35732c2d174dd159b8a03
Diffstat (limited to 'kubernetes/clamp')
-rw-r--r--kubernetes/clamp/components/clamp-backend/requirements.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-backend/templates/deployment.yaml4
-rw-r--r--kubernetes/clamp/components/clamp-backend/values.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-dash-es/requirements.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-dash-es/templates/deployment.yaml4
-rw-r--r--kubernetes/clamp/components/clamp-dash-es/values.yaml7
-rw-r--r--kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml4
-rw-r--r--kubernetes/clamp/components/clamp-dash-kibana/values.yaml8
-rw-r--r--kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-dash-logstash/templates/deployment.yaml4
-rw-r--r--kubernetes/clamp/components/clamp-dash-logstash/values.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-mariadb/requirements.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-mariadb/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/components/clamp-mariadb/values.yaml1
-rw-r--r--kubernetes/clamp/requirements.yaml3
-rw-r--r--kubernetes/clamp/templates/deployment.yaml4
-rw-r--r--kubernetes/clamp/values.yaml4
18 files changed, 29 insertions, 37 deletions
diff --git a/kubernetes/clamp/components/clamp-backend/requirements.yaml b/kubernetes/clamp/components/clamp-backend/requirements.yaml
index 08708fba14..5b041a56f2 100644
--- a/kubernetes/clamp/components/clamp-backend/requirements.yaml
+++ b/kubernetes/clamp/components/clamp-backend/requirements.yaml
@@ -16,4 +16,7 @@
dependencies:
- name: certInitializer
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/clamp/components/clamp-backend/templates/deployment.yaml b/kubernetes/clamp/components/clamp-backend/templates/deployment.yaml
index 1591efb8b4..9153f9d0ff 100644
--- a/kubernetes/clamp/components/clamp-backend/templates/deployment.yaml
+++ b/kubernetes/clamp/components/clamp-backend/templates/deployment.yaml
@@ -48,7 +48,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 }}
name: {{ include "common.name" . }}-readiness
{{ include "common.certInitializer.initContainer" . | indent 6 }}
@@ -57,7 +57,7 @@ spec:
{{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.sidecar" . | nindent 8 }}{{ end }}
# main container
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- sh
diff --git a/kubernetes/clamp/components/clamp-backend/values.yaml b/kubernetes/clamp/components/clamp-backend/values.yaml
index 5e3102e2b3..efd08ba4d0 100644
--- a/kubernetes/clamp/components/clamp-backend/values.yaml
+++ b/kubernetes/clamp/components/clamp-backend/values.yaml
@@ -18,8 +18,6 @@
#################################################################
global: # global defaults
nodePortPrefix: 302
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
- readinessImage: onap/oom/readiness:3.0.1
persistence: {}
centralizedLoggingEnabled: true
#AAF service
@@ -65,7 +63,6 @@ secrets:
flavor: small
# application image
-repository: nexus3.onap.org:10001
image: onap/clamp-backend:5.1.5
pullPolicy: Always
diff --git a/kubernetes/clamp/components/clamp-dash-es/requirements.yaml b/kubernetes/clamp/components/clamp-dash-es/requirements.yaml
index 317d5b5d79..c388db3113 100644
--- a/kubernetes/clamp/components/clamp-dash-es/requirements.yaml
+++ b/kubernetes/clamp/components/clamp-dash-es/requirements.yaml
@@ -19,4 +19,7 @@ dependencies:
repository: '@local'
- name: certInitializer
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/clamp/components/clamp-dash-es/templates/deployment.yaml b/kubernetes/clamp/components/clamp-dash-es/templates/deployment.yaml
index dcf011d315..d7aa77cd01 100644
--- a/kubernetes/clamp/components/clamp-dash-es/templates/deployment.yaml
+++ b/kubernetes/clamp/components/clamp-dash-es/templates/deployment.yaml
@@ -53,7 +53,7 @@ spec:
fieldPath: metadata.namespace
securityContext:
privileged: true
- image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.busyboxImage }}
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: init-sysctl
volumeMounts:
@@ -64,7 +64,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 }}
{{- if .Values.global.aafEnabled }}
command:
diff --git a/kubernetes/clamp/components/clamp-dash-es/values.yaml b/kubernetes/clamp/components/clamp-dash-es/values.yaml
index ed53c0cdc8..1e2ae4778d 100644
--- a/kubernetes/clamp/components/clamp-dash-es/values.yaml
+++ b/kubernetes/clamp/components/clamp-dash-es/values.yaml
@@ -18,7 +18,6 @@
#################################################################
global:
nodePortPrefix: 302
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
persistence: {}
centralizedLoggingEnabled: true
#AAF service
@@ -63,13 +62,7 @@ flavor: small
#################################################################
# Application configuration defaults.
#################################################################
-
-# BusyBox image
-busyboxRepository: docker.io
-busyboxImage: library/busybox:latest
-
# application image
-repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-elasticsearch:5.0.4
pullPolicy: Always
diff --git a/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml b/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml
index 317d5b5d79..c388db3113 100644
--- a/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml
+++ b/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml
@@ -19,4 +19,7 @@ dependencies:
repository: '@local'
- name: certInitializer
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml
index 99f0079831..8cb95cdf0b 100644
--- a/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml
+++ b/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml
@@ -48,13 +48,13 @@ 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
{{ 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 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/clamp/components/clamp-dash-kibana/values.yaml b/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
index a5d11c73cb..9b5f1fc344 100644
--- a/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
@@ -18,8 +18,6 @@
#################################################################
global:
nodePortPrefix: 302
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
- readinessImage: onap/oom/readiness:3.0.1
persistence: {}
centralizedLoggingEnabled: true
#AAF service
@@ -64,13 +62,7 @@ flavor: small
#################################################################
# Application configuration defaults.
#################################################################
-
-# BusyBox image
-busyboxRepository: docker.io
-busyboxImage: library/busybox:latest
-
# application image
-repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-kibana:5.0.4
pullPolicy: Always
diff --git a/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml b/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml
index 317d5b5d79..c388db3113 100644
--- a/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml
+++ b/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml
@@ -19,4 +19,7 @@ dependencies:
repository: '@local'
- name: certInitializer
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/clamp/components/clamp-dash-logstash/templates/deployment.yaml b/kubernetes/clamp/components/clamp-dash-logstash/templates/deployment.yaml
index 9fd4c4095d..f098338c7f 100644
--- a/kubernetes/clamp/components/clamp-dash-logstash/templates/deployment.yaml
+++ b/kubernetes/clamp/components/clamp-dash-logstash/templates/deployment.yaml
@@ -48,13 +48,13 @@ 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
{{ 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 }}
env:
- name: dmaap_consumer_group
diff --git a/kubernetes/clamp/components/clamp-dash-logstash/values.yaml b/kubernetes/clamp/components/clamp-dash-logstash/values.yaml
index 2b3c9f1712..9aab3af252 100644
--- a/kubernetes/clamp/components/clamp-dash-logstash/values.yaml
+++ b/kubernetes/clamp/components/clamp-dash-logstash/values.yaml
@@ -18,8 +18,6 @@
#################################################################
global:
nodePortPrefix: 302
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
- readinessImage: onap/oom/readiness:3.0.1
persistence: {}
centralizedLoggingEnabled: true
#AAF service
@@ -66,7 +64,6 @@ flavor: small
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-logstash:5.0.4
pullPolicy: Always
diff --git a/kubernetes/clamp/components/clamp-mariadb/requirements.yaml b/kubernetes/clamp/components/clamp-mariadb/requirements.yaml
index 9b96d0cfc4..b5d66f3805 100644
--- a/kubernetes/clamp/components/clamp-mariadb/requirements.yaml
+++ b/kubernetes/clamp/components/clamp-mariadb/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/clamp/components/clamp-mariadb/templates/deployment.yaml b/kubernetes/clamp/components/clamp-mariadb/templates/deployment.yaml
index 6d30b3667d..8ddf584988 100644
--- a/kubernetes/clamp/components/clamp-mariadb/templates/deployment.yaml
+++ b/kubernetes/clamp/components/clamp-mariadb/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
spec:
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:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/clamp/components/clamp-mariadb/values.yaml b/kubernetes/clamp/components/clamp-mariadb/values.yaml
index f9a31b6b86..60b2cfef4f 100644
--- a/kubernetes/clamp/components/clamp-mariadb/values.yaml
+++ b/kubernetes/clamp/components/clamp-mariadb/values.yaml
@@ -21,7 +21,6 @@ global: # global defaults
persistence: {}
# application image
-repository: docker.io
image: mariadb:10.5.4
pullPolicy: Always
flavor: small
diff --git a/kubernetes/clamp/requirements.yaml b/kubernetes/clamp/requirements.yaml
index dd93eaca2d..fd71422f78 100644
--- a/kubernetes/clamp/requirements.yaml
+++ b/kubernetes/clamp/requirements.yaml
@@ -17,6 +17,9 @@ dependencies:
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: clamp-mariadb
version: ~6.x-0
repository: 'file://components/clamp-mariadb'
diff --git a/kubernetes/clamp/templates/deployment.yaml b/kubernetes/clamp/templates/deployment.yaml
index 4c9bdb5b14..51b864b986 100644
--- a/kubernetes/clamp/templates/deployment.yaml
+++ b/kubernetes/clamp/templates/deployment.yaml
@@ -48,7 +48,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 }}
name: {{ include "common.name" . }}-readiness
{{ include "common.certInitializer.initContainer" . | nindent 6 }}
@@ -57,7 +57,7 @@ spec:
{{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.sidecar" . | nindent 8 }}{{ end }}
# main container
- 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/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 34ab79f73a..b2b37d3755 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -18,9 +18,6 @@
#################################################################
global: # global defaults
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
centralizedLoggingEnabled: true
#AAF service
aafEnabled: true
@@ -92,7 +89,6 @@ subChartsOnly:
flavor: small
# application image
-repository: nexus3.onap.org:10001
image: onap/clamp-frontend:5.1.5
pullPolicy: Always