commit ec86a530ab1aec15981a257d2a0980d2fceee3ad
author ChrisC <christophe.closset@intl.att.com> Thu Mar 19 15:53:31 2020 -0500
committer ChrisC <christophe.closset@intl.att.com> Tue Apr 07 12:06:29 2020 +0200
tree 157891645a4cef92aa523a2b3644f4eb152a3397
parent bcea64b75f3d8f17759fed3ad7f0051a5874b37c

AAF OOM 2.1.20

Cleaned up up configs, JDK11 fixes, Hello and Agent works, now a model for Apps
non-root fix

Issue-ID: AAF-1081, AAF-1102
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I4947075029db8abd7d2072b6b82064af8e2daa3e

kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml

diff --git a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
index 120bc62..b823acd 100644
--- a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
@@ -31,10 +31,27 @@
         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

kubernetes/aaf/charts/aaf-cm/values.yaml

diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml
index 4078fb3..befbdc1 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.
 #################################################################