Merge pull request #23 from Xtigyro/v162

Puppetserver Service Improvements
puppetlabs · Jan 2, 2020 · e4537a8 · e4537a8
2 parents 27dfaba + 662907d
commit e4537a8
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,15 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version `v0.2.4` is auto-generated.
 
+## [v1.6.2](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v1.6.2) (2020-01-01)
+
+- Puppetserver Service:
+
+1. Allow for more general way of setting the network protocol.
+2. Improve the way of setting the loadBalancerIP.
+
+[Full Changelog](https://github.com/Xtigyro/puppetserver-helm-chart/compare/v1.6.1...v1.6.2)
+
 ## [v1.6.1](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v1.6.1) (2019-12-31)
 
 - Add comments in Values file for Puppetserver Service.

diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Puppet automates the delivery and operation of software.
 name: puppetserver
-version: 1.6.1
+version: 1.6.2
 appVersion: 6.7.2
 keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]
 home: https://puppet.com/

diff --git a/README.md b/README.md
@@ -162,7 +162,7 @@ Parameter | Description | Default
 `puppetserver.pullPolicy` | puppetserver img pull policy | `IfNotPresent`
 `puppetserver.fqdns.alternateServerNames` | puppetserver alternate fqdns |``
 `puppetserver.service.type` | puppetserver svc type | `ClusterIP`
-`puppetserver.service.port` | puppetserver svc port | `8140`
+`puppetserver.service.ports` | puppetserver svc exposed ports | `puppetserver`
 `puppetserver.service.annotations`| puppetserver svc annotations |``
 `puppetserver.service.labels`| puppetserver additional svc labels |``
 `puppetserver.service.loadBalancerIP`| puppetserver svc loadbalancer ip |``

diff --git a/templates/NOTES.txt b/templates/NOTES.txt
@@ -3,7 +3,7 @@ Puppet Server has been installed/upgraded.
 Release Name: "{{ template "puppetserver.fullname" . }}"
 Service Name: "puppet"
 Service Type: "{{.Values.puppetserver.service.type}}"
-Service Port: "{{.Values.puppetserver.service.port}}"
+Service Port: "{{.Values.puppetserver.service.ports.puppetserver.port}}"
 Ingress Enabled: "{{.Values.puppetserver.ingress.enabled}}"
 Control Repo: "{{.Values.puppetserver.puppeturl}}"
 {{- if .Values.hiera.hieradataurl }}

diff --git a/templates/puppetserver-service.yaml b/templates/puppetserver-service.yaml
@@ -13,11 +13,13 @@ metadata:
 {{- end }}
 spec:
   ports:
-    - name: "puppetserver"
-      port: {{.Values.puppetserver.service.port}}
+  {{- range $key, $value := .Values.puppetserver.service.ports }}
+    - name: {{ $key }}
+{{ toYaml $value | indent 6 }}
+  {{- end }}
   selector:
     {{- include "puppetserver.puppetserver.matchLabels" . | nindent 4 }}
   type: {{ .Values.puppetserver.service.type }}
-{{- if .Values.puppetserver.service.loadBalancerIP }}
+{{- if (and (eq .Values.puppetserver.service.type "LoadBalancer") (not (empty .Values.puppetserver.service.loadBalancerIP))) }}
   loadBalancerIP: {{ .Values.puppetserver.service.loadBalancerIP }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
@@ -35,12 +35,16 @@ puppetserver:
   ##
   fqdns:
     alternateServerNames: ""   # Comma-separated
+  ## The usage of a TCP/Network LB type is strongly preferable
+  ## Please check the `README.md` for more information
+  ## Exemplary annotations for few cloud providers
   service:
     type: ClusterIP
-    port: 8140
-    ## The usage of a TCP/Network LB type is strongly preferable
-    ## Please check the `README.md` for more information
-    ## Exemplary annotations for few cloud providers
+    ## The LB type (network protocol) for some cloud providers must be set here.
+    ports:
+      puppetserver:
+        port: 8140
+      #  protocol: TCP
     annotations: {}
     #  service.beta.kubernetes.io/aws-load-balancer-internal: "true"
     #  service.beta.kubernetes.io/aws-load-balancer-type: "nlb"