Removed client service for auth service

Author: sandesvitor

templates/services.yaml

@@ -5,6 +5,12 @@ metadata:
   name: {{ .Release.Name }}-st2auth
   annotations:
     description: StackStorm st2auth - all authentication is managed by this service.
+    {{- if .Values.st2auth.service.hostname }}
+    external-dns.alpha.kubernetes.io/hostname: {{ .Values.st2auth.service.hostname | quote }}
+    {{- end }}
+    {{- if .Values.st2auth.service.annotations }}
+      {{- toYaml .Values.st2auth.service.annotations | nindent 4 }}
+    {{- end }}
   labels:
     app: st2auth
     tier: backend
@@ -16,7 +22,12 @@ spec:
   selector:
     app: st2auth
     release: {{ .Release.Name }}
-  type: ClusterIP
+  type: {{ .Values.st2auth.service.type }}
+  {{- if contains "ExternalName" .Values.st2auth.service.type }}
+  {{- if .Values.st2auth.service.hostname }}
+  externalName: {{ .Values.st2auth.service.hostname }}
+  {{- end }}
+  {{- end }}
   ports:
   - protocol: TCP
     port: 9100
@@ -136,34 +147,3 @@ spec:
   - protocol: TCP
     port: 8081
 {{- end }}
-
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ .Release.Name }}-st2client
-  annotations:
-    description: StackStorm st2client
-    {{- if .Values.st2client.service.hostname }}
-    external-dns.alpha.kubernetes.io/hostname: {{ .Values.st2client.service.hostname | quote }}
-    {{- end }}
-    {{- if .Values.st2client.service.annotations }}
-      {{- toYaml .Values.st2client.service.annotations | nindent 4 }}
-    {{- end }}
-  labels:
-    app: st2client
-    tier: frontend
-    vendor: stackstorm
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  selector:
-    app: st2client
-    release: {{ .Release.Name }}
-  type: {{ .Values.st2client.service.type }}
-  {{- if contains "ExternalName" .Values.st2client.service.type }}
-  {{- if .Values.st2client.service.hostname }}
-  externalName: {{ .Values.st2client.service.hostname }}
-  {{- end }}
-  {{- end }}

values.yaml

@@ -347,6 +347,14 @@ st2auth:
   affinity: {}
   env: {}
   # HTTP_PROXY: http://proxy:1234
+  service:
+    # type can be one of "ClusterIP", "NodePort", "LoadBalancer" or "ExternalName"
+    type: "ClusterIP"
+    # The hostname associated with st2auth service (externalName, added to external DNS, etc.)
+    hostname: ""
+    # For more information regarding annotations, see
+    # https://kubernetes.io/docs/concepts/services-networking/service/#ssl-support-on-aws
+    annotations: {}
   serviceAccount:
     attach: false
   # postStartScript is optional. It has the contents of a bash script.
@@ -714,14 +722,6 @@ st2client:
     username = ${ST2_AUTH_USERNAME}
     password = ${ST2_AUTH_PASSWORD}
   env: {}
-  service:
-    # type can be one of "ClusterIP", "NodePort", "LoadBalancer" or "ExternalName"
-    type: "ClusterIP"
-    # The hostname associated with st2client service (externalName, added to external DNS, etc.)
-    hostname: ""
-    # For more information regarding annotations, see
-    # https://kubernetes.io/docs/concepts/services-networking/service/#ssl-support-on-aws
-    annotations: {}
   # HTTP_PROXY: http://proxy:1234
   ## These named secrets (managed outside this chart) will be added to envFrom.
   envFromSecrets: []