diff options
| author |   dglFromAtt <dgl@research.att.com> | 2019-04-12 20:12:26 +0000 |
|---|---|---|
| committer | dglFromAtt <dgl@research.att.com> | 2019-04-12 20:12:34 +0000 |
| commit | fb58a9d032c7f21f58d8e194245634202dc455a1 (patch) | |
| tree | 431e71763bdc3dc1fdec1800fa9a8631be034cba /kubernetes/dmaap/components/dmaap-bc/templates | |
| parent | c22ceb9913b31ad2738a1f1391b382352a5de67d (diff) | |
Add readiness dependency on aaf
Also some changes for:
- optionally deploy postgres for dmaap-bc. Useful for quick dev deployments
- correct external host IP address for windriver AAF
Change-Id: I5fd74df4a0e5e3537d9573ed8d3f9b87da41689e
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1138
Diffstat (limited to 'kubernetes/dmaap/components/dmaap-bc/templates')
| -rw-r--r-- | kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml index 0ecdc1c0e8..fb31454c63 100644 --- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml +++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml @@ -1,4 +1,4 @@ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. + # Modifications Copyright © 2018 Amdocs,Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,7 +32,7 @@ spec: release: {{ .Release.Name }} spec: hostAliases: - - ip: "10.12.6.214" + - ip: "10.12.5.145" hostnames: - "aaf-onap-test.osaaf.org" initContainers: @@ -40,6 +40,21 @@ spec: - /root/ready.py args: - --container-name + - aaf-locate + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-aaf-readiness +{{ if .Values.PG.enabled }} + - command: + - /root/ready.py + args: + - --container-name - {{ .Values.postgres.nameOverride }} env: - name: NAMESPACE @@ -49,7 +64,8 @@ spec: fieldPath: metadata.namespace image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-readiness + name: {{ include "common.name" . }}-postgres-readiness +{{- end}} containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" |