Merge pull request #25 from slconley/v164

Corrections and additional info for use of Ingress resource

CHANGELOG.md

@@ -5,6 +5,12 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version `v0.2.4` is auto-generated.
 
+## [v1.6.4](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v1.6.4) (2020-01-04)
+
+- Corrections and additional info for use of Ingress resource.
+
+[Full Changelog](https://github.com/Xtigyro/puppetserver-helm-chart/compare/v1.6.3...v1.6.4)
+
 ## [v1.6.3](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v1.6.3) (2020-01-03)
 
 - Allow for using the chart as a chart package.

README.md

@@ -35,6 +35,10 @@ allowedTopologies:
 
 In case a Load Balancer (LB) must sit in front of Puppet Server - please keep in mind that having a Network LB (operating at OSI Layer 4) is preferable.
 
+### NGINX Ingress Controller Configuration
+
+The Ingress resource is disabled by default, but if it is enabled then ssl-passthrough must be used so that puppet agents will get the expected server certificate when connecting to the service.  This feature must be enabled on the Ingress resource itself, but also must be enabled via command line argument to the NGINX Ingress Controller.  More information on that can be found [here](<https://kubernetes.github.io/ingress-nginx/user-guide/cli-arguments/>).
+
 ## Migrating from a Bare-Metal Puppet Master
 
 ### Auto-Signing Certificate Requests

templates/puppetserver-ingress.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.puppetserver.ingress.enabled -}}
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := include "puppetserver.puppetserver.serviceName" . }}
-{{- $servicePort := .Values.puppetserver.service.port -}}
+{{- $servicePort := .Values.puppetserver.service.ports.puppetserver.port -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

values.yaml

@@ -60,8 +60,8 @@ puppetserver:
     ## Puppet Server Ingress annotations
     ##
     annotations: {}
-    #   kubernetes.io/ingress.class: nginx
-    #   kubernetes.io/tls-acme: 'true'
+      # kubernetes.io/ingress.class: nginx
+      # nginx.ingress.kubernetes.io/ssl-passthrough: "true"
     ## Puppet Server Ingress additional labels
     ##
     extraLabels: {}