| commit | 829344b4148924c574ab282b8e01c9ac530e71e2 | [log] [tgz] |
|---|---|---|
| author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | Thu Nov 19 17:07:26 2020 +0100 |
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | Tue Nov 24 16:06:57 2020 +0100 |
| tree | 8d29614b9ac1c1d8b6e6b5c9c1690ef619c75aa6 | |
| parent | 3d2b4077ed695c5fa02252d7504c6723ffc48977 [diff] |
[COMMON][ELASTIC] Uses new tpls for repos / images This commit makes Elasticsearcg template to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I20c18632234c864ef2a29e3cfb259c9838a8c4d6
diff --git a/kubernetes/common/elasticsearch/components/curator/hooks/job.install.yaml b/kubernetes/common/elasticsearch/components/curator/hooks/job.install.yaml index 583c2d7..e1d6cba 100644 --- a/kubernetes/common/elasticsearch/components/curator/hooks/job.install.yaml +++ b/kubernetes/common/elasticsearch/components/curator/hooks/job.install.yaml
@@ -47,7 +47,7 @@ {{- end }} containers: - name: {{ template "common.fullname" . }}-curator - image: {{printf "%s/%s" (include "common.repository" .) .Values.image }} + image: {{printf "%s/%s" (include "repositoryGenerator.repository" .) .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: config-volume
diff --git a/kubernetes/common/elasticsearch/components/curator/requirements.yaml b/kubernetes/common/elasticsearch/components/curator/requirements.yaml index e9a5a5f..fbdf7b8 100644 --- a/kubernetes/common/elasticsearch/components/curator/requirements.yaml +++ b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
@@ -16,3 +16,6 @@ - name: common version: ~6.x-0 repository: 'file://../../../common' + - name: repositoryGenerator + version: ~6.x-0 + repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/curator/templates/cronjob.yaml b/kubernetes/common/elasticsearch/components/curator/templates/cronjob.yaml index b9e2c05..ff63cf0 100644 --- a/kubernetes/common/elasticsearch/components/curator/templates/cronjob.yaml +++ b/kubernetes/common/elasticsearch/components/curator/templates/cronjob.yaml
@@ -76,7 +76,7 @@ {{- end }} containers: - name: {{ template "common.fullname" . }}-curator - image: {{printf "%s/%s" (include "common.repository" .) .Values.image }} + image: {{printf "%s/%s" (include "repositoryGenerator.repository" .) .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: config-volume
diff --git a/kubernetes/common/elasticsearch/components/curator/values.yaml b/kubernetes/common/elasticsearch/components/curator/values.yaml index addd528..62964ff 100644 --- a/kubernetes/common/elasticsearch/components/curator/values.yaml +++ b/kubernetes/common/elasticsearch/components/curator/values.yaml
@@ -22,7 +22,7 @@ mountPath: /dockerdata-nfs/backup storageClass: clusterName: cluster.local -repositoryOverride: docker.io + ################################################################# # Application configuration defaults. #################################################################