Skip to content

Commit 167669c

Browse files
authored
Small improvements to manifest templates (#198)
Issue #, if available: Description of changes: * Add name to containerPort (aws-controllers-k8s/s3-controller#48) * Add namespace to ServiceAccount (aws-controllers-k8s/s3-controller#47) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent c5e12cf commit 167669c

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

templates/config/controller/deployment.yaml.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ spec:
4141
image: controller:latest
4242
name: controller
4343
ports:
44-
- containerPort: 8080
44+
- name: http
45+
containerPort: 8080
4546
resources:
4647
limits:
4748
cpu: 100m

templates/config/controller/service.yaml.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ spec:
99
ports:
1010
- name: metricsport
1111
port: 8080
12-
targetPort: 8080
12+
targetPort: http
1313
protocol: TCP
14-
type: NodePort
14+
type: NodePort

templates/helm/templates/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ spec:
5454
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
5555
name: controller
5656
ports:
57-
- containerPort: {{ .Values.deployment.containerPort }}
57+
- name: http
58+
containerPort: {{ .Values.deployment.containerPort }}
5859
resources:
5960
{{- toYaml .Values.resources | nindent 10 }}
6061
env:

templates/helm/templates/metrics-service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ spec:
2525
ports:
2626
- name: metricsport
2727
port: 8080
28-
targetPort: 8080
28+
targetPort: http
2929
protocol: TCP
30-
{{- end }}
30+
{{- end }}

templates/helm/templates/service-account.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ metadata:
1010
k8s-app: {{ include "app.name" . }}
1111
helm.sh/chart: {{ include "chart.name-version" . }}
1212
name: {{ include "service-account.name" . }}
13+
namespace: {{ .Release.Namespace }}
1314
annotations:
1415
{{- range $key, $value := .Values.serviceAccount.annotations }}
1516
{{ $key }}: {{ $value | quote }}
1617
{{- end }}
17-
{{- end }}
18+
{{- end }}

0 commit comments

Comments
 (0)