From e530c9a02789f83907e3044ae467711b7d5de863 Mon Sep 17 00:00:00 2001
From: Tommy Carpenter <tommy@research.att.com>
Date: Mon, 10 Jun 2019 09:42:49 -0400
Subject: [PATCH] Add some comments, rmr serv, remove template cruft

Change-Id: Ia6e80f4c33163a266f6e1b7ba581475aa07132d8
Signed-off-by: Tommy Carpenter <tommy@research.att.com>
---
 a1mediator/templates/deployment.yaml | 13 -------------
 a1mediator/templates/service.yaml    | 22 +++++++++++++++++++++-
 a1mediator/values.yaml               | 14 ++++++++++++--
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/a1mediator/templates/deployment.yaml b/a1mediator/templates/deployment.yaml
index a73ec1b..82360c0 100644
--- a/a1mediator/templates/deployment.yaml
+++ b/a1mediator/templates/deployment.yaml
@@ -58,16 +58,3 @@ spec:
         - name: "a1conf"
           configMap:
             name: "a1conf"
-
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
diff --git a/a1mediator/templates/service.yaml b/a1mediator/templates/service.yaml
index fc67fc1..3321aa6 100644
--- a/a1mediator/templates/service.yaml
+++ b/a1mediator/templates/service.yaml
@@ -1,3 +1,4 @@
+# This is the service for A1's external facing HTTP API
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,7 +18,7 @@ spec:
     app.kubernetes.io/instance: {{ .Release.Name }}
 
 ---
-
+# This is the service for rmr between A1 and the xapps
 apiVersion: v1
 kind: Service
 metadata:
@@ -34,3 +35,22 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "a1mediator.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+
+---
+# This is the service for the "hidden" port 4561 that rmr listens on for route manager
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.rmrrtemgrservice.name }}
+  labels:
+{{ include "a1mediator.labels" . | indent 4 }}
+
+spec:
+  type: {{ .Values.rmrrtemgrservice.type }}
+  ports:
+    - port: {{ .Values.rmrrtemgrservice.port }}
+      targetPort: {{ .Values.rmrrtemgrservice.port }}
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: {{ include "a1mediator.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/a1mediator/values.yaml b/a1mediator/values.yaml
index 4375422..7c9f1f3 100644
--- a/a1mediator/values.yaml
+++ b/a1mediator/values.yaml
@@ -15,19 +15,29 @@ imageCredentials:
   username:
   password:
 
+# This is the service for A1's external facing HTTP API
 httpservice:
-  port: 10000 ## dont change this!!
+  port: 10000 # This is hardcoded in a1, probably dangerous to change
   type: ClusterIP
 
+# This is the service for rmr between A1 and the xapps
 rmrservice:
   name: rmrservice
-  port: 4562 ## dont change this!!
+  port: 4562 # This is hardcoded in a1, probably dangerous to change
   type: ClusterIP
 
+# This is the service for the "hidden" port 4561 that rmr listens on for route manager
+rmrrtemgrservice:
+  name: rmrrtemgrservice
+  port: 4561 # This is hardcoded in rmr, probably dangerous to change
+  type: ClusterIP
+
+# these are ENV variables that A1 takes; see docs
 rmr_timeout_config:
   rcv_retry_interval_ms: 500
   rcv_retry_times: 20
 
+# These were generated by the helm template generator and have not been altered.
 ingress:
   enabled: false
   annotations: {}
-- 
2.16.6