diff --git a/incubator/haproxy-ingress/Chart.yaml b/incubator/haproxy-ingress/Chart.yaml index 41f860348a..d2b34cd45a 100644 --- a/incubator/haproxy-ingress/Chart.yaml +++ b/incubator/haproxy-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: haproxy-ingress -version: 0.0.1 +version: 0.0.2 appVersion: 0.5.3 home: https://github.com/jcmoraisjr/haproxy-ingress description: Ingress controller implementation for haproxy loadbalancer. diff --git a/incubator/haproxy-ingress/README.md b/incubator/haproxy-ingress/README.md index 3ee786b169..14a7fe23ec 100644 --- a/incubator/haproxy-ingress/README.md +++ b/incubator/haproxy-ingress/README.md @@ -49,6 +49,8 @@ Parameter | Description | Default `controller.image.repository` | controller container image repository | `quay.io/jcmoraisjr/haproxy-ingress` `controller.image.tag` | controller container image tag | `v0.5-beta.3` `controller.image.pullPolicy` | controller container image pullPolicy | `IfNotPresent` +`controller.defaultSslCertificate.secret.namespace` | namespace of default certificate for controller | `{{ .Release.Namespace }}` +`controller.defaultSslCertificate.secret.name` | name of the secret for default certificate of controller | `""` `controller.config` | haproxy ConfigMap entries | none `controller.service.annotations` | annotations for controller service | `{}` `controller.service.labels` | labels for controller service | `{}` diff --git a/incubator/haproxy-ingress/templates/controller-daemonset.yaml b/incubator/haproxy-ingress/templates/controller-daemonset.yaml index cf2717eddd..10846cba9f 100644 --- a/incubator/haproxy-ingress/templates/controller-daemonset.yaml +++ b/incubator/haproxy-ingress/templates/controller-daemonset.yaml @@ -27,6 +27,9 @@ spec: imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}" args: - --default-backend-service={{ .Release.Namespace }}/{{ .Values.defaultBackend.service.name }} + {{- if .Values.controller.defaultSslCertificate.secret.name }} + - --default-ssl-certificate={{ .Values.controller.defaultSslCertificate.secret.namespace | default .Release.Namespace }}/{{ .Values.controller.defaultSslCertificate.secret.name }} + {{- end}} - --configmap={{ .Release.Namespace }}/{{ template "haproxy-ingress.fullname" . }} - --sort-backends ports: diff --git a/incubator/haproxy-ingress/values.yaml b/incubator/haproxy-ingress/values.yaml index fa94c7b1d0..7482aff669 100644 --- a/incubator/haproxy-ingress/values.yaml +++ b/incubator/haproxy-ingress/values.yaml @@ -31,6 +31,13 @@ controller: tag: "v0.5-beta.3" pullPolicy: IfNotPresent + defaultSslCertificate: + secret: + # If not set, release namespace is used + namespace: + # Required + name: + # ConfigMap to configure haproxy ingress config: {}