5 files changed, 8 insertions, 7 deletions
diff --git a/kubernetes/aaf/templates/aaf-configmap.yaml b/kubernetes/aaf/templates/aaf-configmap.yaml
index c8565f2d90..b6e494df46 100644
--- a/kubernetes/aaf/templates/aaf-configmap.yaml
+++ b/kubernetes/aaf/templates/aaf-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aaf-data-configmap
-  namespace: {{ .Values.nsPrefix }}-aaf
+  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 55619b3280..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
diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 4f64048aad..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
diff --git a/kubernetes/aaf/templates/aaf-secret.yaml b/kubernetes/aaf/templates/aaf-secret.yaml
index 705d05053c..4b6984ab38 100644
--- a/kubernetes/aaf/templates/aaf-secret.yaml
+++ b/kubernetes/aaf/templates/aaf-secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: aaf-cs-data-secret
-  namespace: {{ .Values.nsPrefix }}-aaf
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ (.Files.Glob "resources/config/aaf-cs-data/*").AsSecrets | indent 2 }}
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: