Skip to content

Fix Helm templates bug which caused duplicate ports key #551 #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2021
Merged

Fix Helm templates bug which caused duplicate ports key #551 #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f60ddd5
Fix Helm Chart templates - duplicate ports key bug
alex-berger Jun 30, 2021
6ef99bd
Revert Helm Chart version bump as it is not needed
alex-berger Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/helm/aws-node-termination-handler/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Parameter | Description | Default
`windowsNodeSelector` | Tells the Windows daemon set where to place the node-termination-handler pods. For example: `lifecycle: "Ec2Spot"`, `on-demand: "false"`, `aws.amazon.com/purchaseType: "spot"`, etc. Value must be a valid yaml expression. | `{}`
`tolerations` | list of node taints to tolerate | `[ {"operator": "Exists"} ]`
`rbac.create` | if `true`, create and use RBAC resources | `true`
`rbac.pspEnabled` | If `true`, create and use a restricted pod security policy | `false`
`rbac.pspEnabled` | If `true`, create and use a restricted pod security policy | `true`
`serviceAccount.create` | If `true`, create a new service account | `true`
`serviceAccount.name` | Service account to be used | None
`serviceAccount.annotations` | Specifies the annotations for ServiceAccount | `{}`
Expand Down
5 changes: 3 additions & 2 deletions config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,10 @@ spec:
value: {{ .Values.kubernetesEventsExtraAnnotations | quote }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.enablePrometheusServer }}
{{- if or .Values.enablePrometheusServer .Values.enableProbesServer }}
ports:
{{- end }}
{{- if .Values.enablePrometheusServer }}
- containerPort: {{ .Values.prometheusServerPort }}
{{- if .Values.useHostNetwork }}
hostPort: {{ .Values.prometheusServerPort }}
Expand All @@ -190,7 +192,6 @@ spec:
protocol: TCP
{{- end }}
{{- if .Values.enableProbesServer }}
ports:
- containerPort: {{ .Values.probesServerPort }}
{{- if .Values.useHostNetwork }}
hostPort: {{ .Values.probesServerPort }}
Expand Down
5 changes: 3 additions & 2 deletions config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,16 @@ spec:
value: {{ .Values.kubernetesEventsExtraAnnotations | quote }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.enablePrometheusServer }}
{{- if or .Values.enablePrometheusServer .Values.enableProbesServer }}
ports:
{{- end }}
{{- if .Values.enablePrometheusServer }}
- containerPort: {{ .Values.prometheusServerPort }}
hostPort: {{ .Values.prometheusServerPort }}
name: http-metrics
protocol: TCP
{{- end }}
{{- if .Values.enableProbesServer }}
ports:
- containerPort: {{ .Values.probesServerPort }}
hostPort: {{ .Values.probesServerPort }}
name: liveness-probe
Expand Down
5 changes: 3 additions & 2 deletions config/helm/aws-node-termination-handler/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,16 @@ spec:
value: {{ .Values.kubernetesEventsExtraAnnotations | quote }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.enablePrometheusServer }}
{{- if or .Values.enablePrometheusServer .Values.enableProbesServer }}
ports:
{{- end }}
{{- if .Values.enablePrometheusServer }}
- containerPort: {{ .Values.prometheusServerPort }}
hostPort: {{ .Values.prometheusServerPort }}
name: http-metrics
protocol: TCP
{{- end }}
{{- if .Values.enableProbesServer }}
ports:
- containerPort: {{ .Values.probesServerPort }}
hostPort: {{ .Values.probesServerPort }}
name: liveness-probe
Expand Down