diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-04-08 07:38:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-08 07:38:21 +0000 |
| commit | 705a9cf88b4840507c9e5a9e7a009e3772229f04 (patch) | |
| tree | 3871ee27358e2c46c55cb1f4413b4cd9580968cc /kubernetes/aaf/charts/aaf-cm | |
| parent | f3601a7187335e16e46ddb3746ec183f8c65f985 (diff) | |
| parent | ec86a530ab1aec15981a257d2a0980d2fceee3ad (diff) | |
Merge "AAF OOM 2.1.20"
Diffstat (limited to 'kubernetes/aaf/charts/aaf-cm')
| -rw-r--r-- | kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml | 19 | ||||
| -rw-r--r-- | kubernetes/aaf/charts/aaf-cm/values.yaml | 9 |
2 files changed, 20 insertions, 8 deletions
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml index 120bc62799..b823acd3d5 100644 --- a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml +++ b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml @@ -31,10 +31,27 @@ spec: release: {{ include "common.release" . }} spec: initContainers: + - name: fix-permission + command: + - /bin/sh + args: + - -c + - | + chmod -R 775 /opt/app/aaf/status + chown -R 1000:1000 /opt/app/aaf/status + chmod -R 775 /opt/app/osaaf + chown -R 1000:1000 /opt/app/osaaf + image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - mountPath: /opt/app/aaf/status + name: aaf-status-vol + - mountPath: /opt/app/osaaf + name: aaf-config-vol - name: {{ include "common.name" . }}-config-container image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service remove && bin/agent.sh"] + command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service aaf-locate remove && bin/agent.sh"] volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml index 4078fb3c22..befbdc191d 100644 --- a/kubernetes/aaf/charts/aaf-cm/values.yaml +++ b/kubernetes/aaf/charts/aaf-cm/values.yaml @@ -1,4 +1,5 @@ # Copyright © 2017 Amdocs, Bell Canada +# Modifications © 2020 AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,14 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -################################################################# -# Global configuration defaults. -################################################################# -global: - nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 flavor: small + ################################################################# # Application configuration defaults. ################################################################# |