Small improvements to manifest templates

* Add name to containerPort (aws-controllers-k8s/s3-controller#48)
* Add namespace to ServiceAccount (aws-controllers-k8s/s3-controller#47)

Author: twz123

templates/config/controller/deployment.yaml.tpl

@@ -41,7 +41,8 @@ spec:
         image: controller:latest
         name: controller
         ports:
-          - containerPort: 8080
+          - name: http
+            containerPort: 8080
         resources:
           limits:
             cpu: 100m

templates/config/controller/service.yaml.tpl

@@ -9,6 +9,6 @@ spec:
   ports:
     - name: metricsport
       port: 8080
-      targetPort: 8080
+      targetPort: http
       protocol: TCP
-  type: NodePort
+  type: NodePort

templates/helm/templates/deployment.yaml

@@ -54,7 +54,8 @@ spec:
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         name: controller
         ports:
-          - containerPort: {{ .Values.deployment.containerPort }}
+          - name: http
+            containerPort: {{ .Values.deployment.containerPort }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         env:

templates/helm/templates/metrics-service.yaml

@@ -25,6 +25,6 @@ spec:
   ports:
   - name: metricsport
     port: 8080
-    targetPort: 8080
+    targetPort: http
     protocol: TCP
-{{- end }}
+{{- end }}

templates/helm/templates/service-account.yaml

@@ -10,8 +10,9 @@ metadata:
     k8s-app: {{ include "app.name" . }}
     helm.sh/chart: {{ include "chart.name-version" . }}
   name: {{ include "service-account.name" . }}
+  namespace: {{ "{{ .Release.Namespace }}" }}
   annotations:
   {{- range $key, $value := .Values.serviceAccount.annotations }}
     {{ $key }}: {{ $value | quote }}
   {{- end }}
-{{- end }}
+{{- end }}