diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2019-04-15 14:50:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-15 14:50:32 +0000 |
| commit | 53196542d0131ab77a9e29023b1b51fb68d90b0e (patch) | |
| tree | 214be8c9804542bfe29b443a223ad2c3c1d67ac2 /kubernetes/policy/charts/policy-pap/templates | |
| parent | b34d0e540e38d887bb07444e2640ac9234ea7052 (diff) | |
| parent | 6acdabf126d24f2f01a360e8e4ff1837ac264b09 (diff) | |
Merge "Adding configurations & fixing policy/pap charts"
Diffstat (limited to 'kubernetes/policy/charts/policy-pap/templates')
| -rw-r--r-- | kubernetes/policy/charts/policy-pap/templates/configmap.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/policy/charts/policy-pap/templates/deployment.yaml | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/kubernetes/policy/charts/policy-pap/templates/configmap.yaml b/kubernetes/policy/charts/policy-pap/templates/configmap.yaml index 56180768a1..19ce6a8f20 100644 --- a/kubernetes/policy/charts/policy-pap/templates/configmap.yaml +++ b/kubernetes/policy/charts/policy-pap/templates/configmap.yaml @@ -22,5 +22,5 @@ metadata: name: {{ include "common.fullname" . }}-configmap namespace: {{ include "common.namespace" . }} data: -{{ tpl (.Files.Glob "resources/config/config.json").AsConfig . | indent 2 }} +{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} diff --git a/kubernetes/policy/charts/policy-pap/templates/deployment.yaml b/kubernetes/policy/charts/policy-pap/templates/deployment.yaml index 5bec94b102..4945f766d8 100644 --- a/kubernetes/policy/charts/policy-pap/templates/deployment.yaml +++ b/kubernetes/policy/charts/policy-pap/templates/deployment.yaml @@ -16,12 +16,27 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.global.mariadb.nameOverride }} + 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" . }}-readiness containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/opt/app/policy/pap/bin/policy-pap.sh"] - args: ["/opt/app/policy/pap/etc/mounted/config.json"] + args: ["/opt/app/policy/pap/etc/mounted/config.json", "/opt/app/policy/pap/etc/mounted/topic.properties"] ports: - containerPort: {{ .Values.service.internalPort }} # disable liveness probe when breakpoints set in debugger |