Batch, Remove unneeded Classes, refine, etc

Issue-ID: AAF-789
Change-Id: I48b39bb79144b20dfac5ff61e41ea4f0035b8442
Signed-off-by: Instrumental <jonathan.gathman@att.com>

10 files changed, 18 insertions, 11 deletions

diff --git a/auth/helm/aaf/Chart.yaml b/auth/helm/aaf/Chart.yaml
index 9582a394..e5ba1746 100644
--- a/auth/helm/aaf/Chart.yaml
+++ b/auth/helm/aaf/Chart.yaml
@@ -22,4 +22,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: AAF Helm Chart
 name: aaf
-version: 2.1.10-SNAPSHOT
+version: 2.1.11-SNAPSHOT
diff --git a/auth/helm/aaf/templates/aaf-cass.yaml b/auth/helm/aaf/templates/aaf-cass.yaml
index 5d4354b6..6a205a0e 100644
--- a/auth/helm/aaf/templates/aaf-cass.yaml
+++ b/auth/helm/aaf/templates/aaf-cass.yaml
@@ -48,7 +48,7 @@ metadata:
   labels:
     app: aaf-cass
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas.cass }}
   selector:
     matchLabels:
       app: aaf-cass
diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml
index f58d81b1..f8bca522 100644
--- a/auth/helm/aaf/templates/aaf-cm.yaml
+++ b/auth/helm/aaf/templates/aaf-cm.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-cm
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas.cm }}
   selector:
     matchLabels:
       app: aaf-cm
diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index 746bd5b7..999b8d13 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-fs
 spec:
-  replicas: 1
+  replicas: 0
   selector:
     matchLabels:
       app: aaf-fs
diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml
index 526616c1..2a509b76 100644
--- a/auth/helm/aaf/templates/aaf-gui.yaml
+++ b/auth/helm/aaf/templates/aaf-gui.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-gui
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas.gui }}
   selector:
     matchLabels:
       app: aaf-gui
diff --git a/auth/helm/aaf/templates/aaf-hello.yaml b/auth/helm/aaf/templates/aaf-hello.yaml
index 2b605724..7c91c856 100644
--- a/auth/helm/aaf/templates/aaf-hello.yaml
+++ b/auth/helm/aaf/templates/aaf-hello.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-hello
 spec:
-  replicas: 0
+  replicas: {{ .Values.replicas.hello }}
   selector:
     matchLabels:
       app: aaf-hello
diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml
index 7bb9135b..1e05dcb7 100644
--- a/auth/helm/aaf/templates/aaf-locate.yaml
+++ b/auth/helm/aaf/templates/aaf-locate.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-locate
 spec:
-  replicas: 1
+  replicas: 0
   selector:
     matchLabels:
       app: aaf-locate
diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index f59a7d24..1a382c06 100644
--- a/auth/helm/aaf/templates/aaf-oauth.yaml
+++ b/auth/helm/aaf/templates/aaf-oauth.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-oauth
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas.oauth }}
   selector:
     matchLabels:
       app: aaf-oauth
diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index 117a0753..e6d6d09b 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -42,7 +42,7 @@ metadata:
   labels:
     app: aaf-service
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas.service }}
   selector:
     matchLabels:
       app: aaf-service
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index 2deb76ee..417e9fb5 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -22,14 +22,21 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 1
-
 global:
   persistence:
     enabled: true
   common:
     namespace: "onap"
 
+replicas:
+  cass: 1
+  service: 0
+  locator: 0
+  oauth: 0
+  cm: 0
+  gui: 0
+  hello: 0
+
 ingress:
   enabled: false