Skip to content

Commit

Permalink
Corrections and additional info for use of Ingress resource
Browse files Browse the repository at this point in the history
  • Loading branch information
slconley committed Jan 3, 2020
1 parent 4507902 commit e0cac32
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/puppetserver-ingress.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down

0 comments on commit e0cac32

Please sign in to comment.