5 files changed, 30 insertions, 10 deletions
diff --git a/kubernetes/aaf/templates/aaf-configmap.yaml b/kubernetes/aaf/templates/aaf-configmap.yaml
new file mode 100644
index 0000000000..b6e494df46
--- /dev/null
+++ b/kubernetes/aaf/templates/aaf-configmap.yaml
@@ -0,0 +1,9 @@
+#{{ if not .Values.disableAafAaf }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aaf-data-configmap
+  namespace: {{ .Values.nsPrefix }}
+data:
+{{ (.Files.Glob "resources/config/aaf-data/*").AsConfig | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
index acd6a7aeb6..817f876f6f 100644
--- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
@@ -3,9 +3,9 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aaf-cs
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
-  replicas: 1
+  replicas: {{ .Values.aafcsReplicas }}
   selector:
     matchLabels:
       app: aaf-cs
@@ -31,8 +31,8 @@ spec:
           periodSeconds: 10
       volumes:
         - name: aaf-cs-data
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data
+          secret:
+            secretName: aaf-cs-data-secret
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
-#{{ end }}
-\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 6664f18886..c084cd36b6 100644
--- a/kubernetes/aaf/templates/aaf-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-deployment.yaml
@@ -5,8 +5,9 @@ metadata:
   labels:
     app: aaf
   name: aaf
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.aafReplicas }}
   selector:
     matchLabels:
       app: aaf
@@ -48,8 +49,8 @@ spec:
           periodSeconds: 10
       volumes:
         - name: aaf-data
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data2
+          configMap:
+            name: aaf-data-configmap
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
 #{{ end }}
diff --git a/kubernetes/aaf/templates/aaf-secret.yaml b/kubernetes/aaf/templates/aaf-secret.yaml
new file mode 100644
index 0000000000..4b6984ab38
--- /dev/null
+++ b/kubernetes/aaf/templates/aaf-secret.yaml
@@ -0,0 +1,10 @@
+#{{ if not .Values.disableAafAafCs }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: aaf-cs-data-secret
+  namespace: {{ .Values.nsPrefix }}
+type: Opaque
+data:
+{{ (.Files.Glob "resources/config/aaf-cs-data/*").AsSecrets | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/aaf/templates/all-services.yaml b/kubernetes/aaf/templates/all-services.yaml
index be04180089..0a06d1dd3c 100644
--- a/kubernetes/aaf/templates/all-services.yaml
+++ b/kubernetes/aaf/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aaf-cs
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aaf-cs
 spec:
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aaf-authz-service
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aaf-authz-service
 spec: