Skip to content

New release 0.5.0 including publishService value #2

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 1 commit into from
Jan 28, 2020
Merged

New release 0.5.0 including publishService value #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 kubernetes-ingress/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

apiVersion: v1
name: kubernetes-ingress
version: 0.4.2
version: 0.5.0
kubeVersion: ">=1.12.0-0"
description: A Helm chart for HAProxy Kubernetes Ingress Controller
keywords:
Expand Down
14 changes: 14 additions & 0 deletions kubernetes-ingress/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,17 @@ Create a default fully qualified default cert secret name.
{{/*
Expand the name of the chart.
*/}}

{{/*
Construct the path for the publish-service.

By default this will use the <namespace>/<service-name> matching the controller's service name.

Users can provide an override for an explicit service they want to use via `.Values.controller.publishService.pathOverride`

*/}}
{{- define "kubernetes-ingress.publishServicePath" -}}
{{- $defServicePath := printf "%s/%s" .Release.Namespace (include "kubernetes-ingress.fullname" .) -}}
{{- $servicePath := default $defServicePath .Values.controller.publishService.pathOverride }}
{{- print $servicePath | trunc 63 |trimSuffix "-" -}}
{{- end -}}
3 changes: 3 additions & 0 deletions kubernetes-ingress/templates/controller-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ spec:
{{- if .Values.controller.ingressClass }}
- --ingress.class={{ .Values.controller.ingressClass }}
{{- end }}
{{- if .Values.controller.publishService.enabled }}
- --publish-service={{ template "kubernetes-ingress.publishServicePath" . }}
{{- end }}
{{- range .Values.controller.extraArgs }}
- {{ . }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions kubernetes-ingress/templates/controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ spec:
{{- if .Values.controller.ingressClass }}
- --ingress.class={{ .Values.controller.ingressClass }}
{{- end }}
{{- if .Values.controller.publishService.enabled }}
- --publish-service={{ template "kubernetes-ingress.publishServicePath" . }}
{{- end }}
{{- range .Values.controller.extraArgs }}
- {{ . }}
{{- end }}
Expand Down
9 changes: 9 additions & 0 deletions kubernetes-ingress/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ controller:
# rate-limit-size: "100k"
# syslogServer: "port:514, address:192.168.122.1, facility:local0"

## Mirrors the address of the service's endpoints to the
## load-balancer status of all Ingress objects it satisfies.
publishService:
enabled: false
##
## Override of the publish service
## Must be <namespace>/<service_name>
pathOverride: ""

## Controller Service configuration
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
service:
Expand Down