Add Support for Ingress pathType and ingressClassName. Bump Puppetserver and PuppetDB Versions to Latest. Allow KubeVersion To Be Overridden. (#97)

* add support for ingress pathtype. bump puppetserver and puppetdb versions.

* Update CODEOWNERS

* rm any leftover

* add optional ingress class name

* Update puppetboard-ingress.yaml

* compilers: add optional ingress class name. fix api version used.

* masters: add optional ingress class name. fix api version used.

* further ingress tweaks.

* further ingress tweaks.

* further ingress tweaks.

* Update CHANGELOG.md

* fix release date

* Update CODEOWNERS

* Update puppetboard-ingress.yaml

* Update puppetserver-ingress-compilers.yaml

* Update puppetserver-ingress-masters.yaml

* Update CHANGELOG.md

Author: Xtigyro

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.
 
+## [v5.12.0](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v5.12.0) (2021-09-21)
+
+- feat: add support for Ingress `pathType` and `ingressClassName`.
+- feat: bump Puppetserver to `v7.3.0`.
+- feat: bump PuppetDB to `v7.5.2`.
+
 ## [v5.11.0](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v5.11.0) (2021-08-30)
 
 - fix: set securityContext for puppetboard container

CODEOWNERS

@@ -1,3 +1,3 @@
 # This repository is owned by Puppet's Platform Services team and community partners
 
-* @puppetlabs/platform-services @Xtigyro @raphink
+* @puppetlabs/platform-services @Xtigyro @slconley @raphink

Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: puppetserver
-version: 5.11.0
-appVersion: 7.1.2
+version: 5.12.0
+appVersion: 7.3.0
 description: Puppet automates the delivery and operation of software.
 keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]
 home: https://puppet.com/

templates/_helpers.tpl

@@ -187,6 +187,33 @@ Puppet Compilers' port.
 {{- end -}}
 {{- end -}}
 
+{{/* Allow KubeVersion to be overridden. */}}
+{{- define "puppetserver.kubeVersion" -}}
+  {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}}
+{{- end -}}
+
+{{/* Get Ingress API Version */}}
+{{- define "puppetserver.ingress.apiVersion" -}}
+  {{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19-0" (include "puppetserver.kubeVersion" .)) -}}
+      {{- print "networking.k8s.io/v1" -}}
+  {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
+    {{- print "networking.k8s.io/v1beta1" -}}
+  {{- else -}}
+    {{- print "extensions/v1beta1" -}}
+  {{- end -}}
+{{- end -}}
+
+{{/* Check Ingress stability */}}
+{{- define "puppetserver.ingress.isStable" -}}
+  {{- eq (include "puppetserver.ingress.apiVersion" .) "networking.k8s.io/v1" -}}
+{{- end -}}
+
+{{/* Check Ingress supports pathType */}}
+{{/* pathType was added to networking.k8s.io/v1beta1 in Kubernetes 1.18 */}}
+{{- define "puppetserver.ingress.supportsPathType" -}}
+  {{- or (eq (include "puppetserver.ingress.isStable" .) "true") (and (eq (include "puppetserver.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" (include "puppetserver.kubeVersion" .))) -}}
+{{- end -}}
+
 {{/*
 Set's the affinity for pod placement
 when running with multiple Puppet compilers.

templates/puppetboard-ingress.yaml

@@ -1,9 +1,11 @@
-{{- if .Values.puppetboard.enabled }}
-{{- if .Values.puppetboard.ingress.enabled }}
+{{- if and .Values.puppetboard.enabled .Values.puppetboard.ingress.enabled }}
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := "puppetdb" }}
 {{- $servicePort := .Values.puppetboard.port -}}
-apiVersion: networking.k8s.io/v1
+{{- $pathType := .Values.puppetboard.ingress.pathType | default "ImplementationSpecific" -}}
+{{- $apiIsStable := eq (include "puppetserver.ingress.isStable" .) "true" -}}
+{{- $ingressSupportsPathType := eq (include "puppetserver.ingress.supportsPathType" .) "true" -}}
+apiVersion: {{ include "puppetserver.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   {{- if .Values.puppetboard.ingress.annotations }}
@@ -17,23 +19,34 @@ metadata:
     {{- end }}
   name: puppetboard
 spec:
+  {{- if $apiIsStable }}
+  {{- if .Values.puppetboard.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.puppetboard.ingress.ingressClassName }}
+  {{- end }}
+  {{- end }}
   rules:
     {{- range .Values.puppetboard.ingress.hosts }}
     {{- $url := splitList "/" . }}
     - host: {{ first $url }}
       http:
         paths:
           - path: /{{ rest $url | join "/" }}
-            pathType: Prefix
+            {{- if and $pathType $ingressSupportsPathType }}
+            pathType: {{ $pathType }}
+            {{- end }}
             backend:
+              {{- if $apiIsStable }}
               service:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
+              {{- else }}
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $servicePort }}
+              {{- end }}
     {{- end -}}
   {{- if .Values.puppetboard.ingress.tls }}
   tls:
     {{ toYaml .Values.puppetboard.ingress.tls | nindent 4 }}
   {{- end -}}
 {{- end -}}
-{{- end -}}

templates/puppetserver-ingress-compilers.yaml

@@ -1,9 +1,11 @@
-{{- if .Values.puppetserver.compilers.enabled }}
-{{- if .Values.puppetserver.compilers.ingress.enabled -}}
+{{- if and .Values.puppetserver.compilers.enabled .Values.puppetserver.compilers.ingress.enabled -}}
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := include "puppetserver.puppetserver-compilers.serviceName" . }}
 {{- $servicePort := .Values.puppetserver.compilers.service.ports.puppetserver.port -}}
-apiVersion: networking.k8s.io/v1
+{{- $pathType := .Values.puppetserver.compilers.ingress.pathType | default "ImplementationSpecific" -}}
+{{- $apiIsStable := eq (include "puppetserver.ingress.isStable" .) "true" -}}
+{{- $ingressSupportsPathType := eq (include "puppetserver.ingress.supportsPathType" .) "true" -}}
+apiVersion: {{ include "puppetserver.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   {{- if .Values.puppetserver.compilers.ingress.annotations }}
@@ -17,22 +19,34 @@ metadata:
     {{- end }}
   name: {{ template "puppetserver.fullname" . }}-compilers
 spec:
+  {{- if $apiIsStable }}
+  {{- if .Values.puppetserver.compilers.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.puppetserver.compilers.ingress.ingressClassName }}
+  {{- end }}
+  {{- end }}
   rules:
     {{- range .Values.puppetserver.compilers.ingress.hosts }}
     {{- $url := splitList "/" . }}
     - host: {{ first $url }}
       http:
         paths:
           - path: /{{ rest $url | join "/" }}
+            {{- if and $pathType $ingressSupportsPathType }}
+            pathType: {{ $pathType }}
+            {{- end }}
             backend:
+              {{- if $apiIsStable }}
               service:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
+              {{- else }}
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $servicePort }}
+              {{- end }}
     {{- end -}}
   {{- if .Values.puppetserver.compilers.ingress.tls }}
   tls:
     {{ toYaml .Values.puppetserver.compilers.ingress.tls | nindent 4 }}
   {{- end -}}
 {{- end -}}
-{{- end -}}

templates/puppetserver-ingress-masters.yaml

@@ -2,7 +2,10 @@
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := include "puppetserver.puppetserver-masters.serviceName" . }}
 {{- $servicePort := .Values.puppetserver.masters.service.ports.puppetserver.port -}}
-apiVersion: networking.k8s.io/v1
+{{- $pathType := .Values.puppetserver.masters.ingress.pathType | default "ImplementationSpecific" -}}
+{{- $apiIsStable := eq (include "puppetserver.ingress.isStable" .) "true" -}}
+{{- $ingressSupportsPathType := eq (include "puppetserver.ingress.supportsPathType" .) "true" -}}
+apiVersion: {{ include "puppetserver.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   {{- if .Values.puppetserver.masters.ingress.annotations }}
@@ -16,18 +19,31 @@ metadata:
     {{- end }}
   name: {{ template "puppetserver.fullname" . }}-masters
 spec:
+  {{- if $apiIsStable }}
+  {{- if .Values.puppetserver.masters.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.puppetserver.masters.ingress.ingressClassName }}
+  {{- end }}
+  {{- end }}
   rules:
     {{- range .Values.puppetserver.masters.ingress.hosts }}
     {{- $url := splitList "/" . }}
     - host: {{ first $url }}
       http:
         paths:
           - path: /{{ rest $url | join "/" }}
+            {{- if and $pathType $ingressSupportsPathType }}
+            pathType: {{ $pathType }}
+            {{- end }}
             backend:
+              {{- if $apiIsStable }}
               service:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
+              {{- else }}
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $servicePort }}
+              {{- end }}
     {{- end -}}
   {{- if .Values.puppetserver.masters.ingress.tls }}
   tls:

values.yaml

@@ -7,7 +7,7 @@
 puppetserver:
   name: puppetserver
   image: puppet/puppetserver
-  tag: 7.1.2
+  tag: 7.3.0
   pullPolicy: IfNotPresent
   ## Mandatory Deployment of Puppet Server Master/s
   ##
@@ -378,7 +378,7 @@ r10k:
 puppetdb:
   name: puppetdb
   image: puppet/puppetdb
-  tag: 7.2.0
+  tag: 7.5.2
   pullPolicy: IfNotPresent
   resources: {}
   #  requests:
@@ -595,6 +595,10 @@ global:
 ##
 nameOverride: ""
 
+## Allow KubeVersion to be overridden.
+##
+kubeVersionOverride: ""
+
 ## Pod Configuration
 ##
 ## Node labels for pod assignment