diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 22:52:46 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-29 10:09:40 +0100 |
| commit | 5ee4dd4bb9e96ae21ac5b37453e3d1d8c674c966 (patch) | |
| tree | 395c55714f2647c01e7aeb6d2714c847b24c281a /kubernetes/contrib/components/ejbca | |
| parent | fe28feccab5e8c0cd1f2b72b940a0f27a279e5da (diff) | |
[CONTRIB] Uses new tpls for repos / images
This commit makes Contrib chart to use the new generator for repositories and
images.
As new templates doesn't work well with "sub charts", we move also
subcharts to components folder.
Issue-ID: OOM-2364
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I33ca36a2b25e67fd9f74ae408cd34f58405d6b80
Diffstat (limited to 'kubernetes/contrib/components/ejbca')
| -rw-r--r-- | kubernetes/contrib/components/ejbca/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/contrib/components/ejbca/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/contrib/components/ejbca/values.yaml | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml index e87bc08da3..00542037af 100644 --- a/kubernetes/contrib/components/ejbca/requirements.yaml +++ b/kubernetes/contrib/components/ejbca/requirements.yaml @@ -23,3 +23,6 @@ dependencies: version: ~6.x-0 repository: '@local' condition: not global.mariadbGalera.localCluster + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/contrib/components/ejbca/templates/deployment.yaml b/kubernetes/contrib/components/ejbca/templates/deployment.yaml index 55de54febf..a10b0592de 100644 --- a/kubernetes/contrib/components/ejbca/templates/deployment.yaml +++ b/kubernetes/contrib/components/ejbca/templates/deployment.yaml @@ -40,11 +40,11 @@ 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 }} containers: - name: {{ include "common.name" . }}-ejbca - image: {{ .Values.ejbca.image }} + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.ejbca.image }} imagePullPolicy: {{ .Values.pullPolicy }} lifecycle: postStart: diff --git a/kubernetes/contrib/components/ejbca/values.yaml b/kubernetes/contrib/components/ejbca/values.yaml index 35160e4b13..c26bfe2fbb 100644 --- a/kubernetes/contrib/components/ejbca/values.yaml +++ b/kubernetes/contrib/components/ejbca/values.yaml @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. global: - readinessImage: onap/oom/readiness:3.0.1 - mariadbGalera: &mariadbGalera + mariadbGalera: &mariadbGalera #This flag allows EJBCA to instantiate its own mariadb-galera cluster localCluster: false service: mariadb-galera @@ -37,7 +36,6 @@ secrets: password: '{{ .Values.config.ejbca.clientIak }}' # application configuration -repository: nexus3.onap.org:10001 config: db: userName: ejbca |