diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-26 09:57:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-26 09:57:26 +0000 |
| commit | c95cb6667263e48daed36613565fb6466bce0553 (patch) | |
| tree | 226097d6245509753882bb6c7b4ad2335dbe1e3e /kubernetes/aaf/components/aaf-cass | |
| parent | 4a53ea1b30dd22b37064e5a3e94f91dae79cf99c (diff) | |
| parent | 0dfa387b0e86d79822335ffeb652d81ca8b60564 (diff) | |
Merge "[AAF] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/aaf/components/aaf-cass')
| -rw-r--r-- | kubernetes/aaf/components/aaf-cass/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/aaf/components/aaf-cass/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/aaf/components/aaf-cass/values.yaml | 12 |
3 files changed, 5 insertions, 14 deletions
diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml index 9cf405b818..26bc7a64d8 100644 --- a/kubernetes/aaf/components/aaf-cass/requirements.yaml +++ b/kubernetes/aaf/components/aaf-cass/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/aaf/components/aaf-cass/templates/deployment.yaml b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml index 30e25269cd..4dc508fa7c 100644 --- a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml +++ b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml @@ -33,7 +33,7 @@ spec: - | chown -R 1000:1000 /opt/app/aaf/status chown -R 1000:1000 /var/lib/cassandra - image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}" + image: {{ include "repositoryGenerator.image.busybox" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /var/lib/cassandra @@ -47,7 +47,7 @@ spec: memory: 100Mi containers: - name: {{ include "common.name" . }} - image: {{ include "common.repository" . }}/{{ .Values.image }} + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} # installing with cmd "onap" will not only initialize the DB, but add ONAP bootstrap data as well command: ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh","onap"] diff --git a/kubernetes/aaf/components/aaf-cass/values.yaml b/kubernetes/aaf/components/aaf-cass/values.yaml index f4d1d2eef0..525674434e 100644 --- a/kubernetes/aaf/components/aaf-cass/values.yaml +++ b/kubernetes/aaf/components/aaf-cass/values.yaml @@ -14,22 +14,10 @@ # limitations under the License. global: nodePortPrefix: 302 - # Readiness image - readinessImage: onap/oom/readiness:3.0.1 - # Ubuntu Init image - ubuntuInitRepository: docker.io - ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 - # Logging image - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - # BusyBox image - busyboxRepository: docker.io - busyboxImage: library/busybox:1.31 persistence: enabled: true # Standard OOM pullPolicy: "Always" - repository: "nexus3.onap.org:10001" flavor: small |