Merge pull request #3 from Xtigyro/v120

Chart v1.2.0

Author: Xtigyro

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.2.0](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v1.2.0) (2019-11-21)
+- Add optional extra container environment variables.
+- Add optional "r10k" extra container arguments.
+- Bump PupptDB to v6.7.3.
+- Small code indentation improvements.
+- README updates.
+
+[Full Changelog](https://github.com/Xtigyro/puppetserver-helm-chart/compare/v1.1.0...v1.2.0)
+
 ## [v1.1.0](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v1.1.0) (2019-11-19)
 - Switch Pulling the Hiera Data Repo from Using "git_sync" to "r10k".
 

Chart.yaml

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

README.md

@@ -53,31 +53,38 @@ You can use `kubectl get` to view all of the installed components.
 
 ```console
 $ kubectl get --namespace puppetserver all -l app=puppetserver
-NAME                                READY   STATUS    RESTARTS   AGE
-pod/postgres-77cfcbf9f-md4zh        1/1     Running   0          10m
-pod/puppetboard-7677f4b747-67vbx    1/1     Running   0          10m
-pod/puppetdb-85c799d8fb-94t4h       1/1     Running   0          10m
-pod/puppetserver-6d48cb454b-5drxj   2/2     Running   0          10m
-
-NAME               TYPE           CLUSTER-IP     EXTERNAL-IP     PORT(S)             AGE
-service/postgres   ClusterIP      10.0.39.67     <none>          5432/TCP            10m
-service/puppet     LoadBalancer   10.0.80.150    192.168.1.101   8140:31499/TCP      10m
-service/puppetdb   ClusterIP      10.0.149.173   <none>          8080/TCP,8081/TCP   10m
+NAME                                READY   STATUS      RESTARTS   AGE
+pod/postgres-584d75d8b-gw8n6        1/1     Running     0          31m
+pod/puppetdb-5f6fd6df7d-fqbc2       1/1     Running     0          31m
+pod/puppetserver-54f889b9c5-r7gm9   1/1     Running     0          31m
+pod/r10k-deploy-1573860480-5nnp9    0/1     Completed   0          6m6s
+pod/r10k-deploy-1573860600-qhk5j    0/1     Completed   0          4m6s
+pod/r10k-deploy-1573860720-hhkpp    0/1     Completed   0          2m6s
+pod/r10k-deploy-1573860840-tsx2n    0/1     Completed   0          6s
+
+NAME               TYPE        CLUSTER-IP    EXTERNAL-IP   PORT(S)             AGE
+service/postgres   ClusterIP   10.0.193.66   <none>        5432/TCP            31m
+service/puppet     ClusterIP   10.0.79.57    <none>        8140/TCP            31m
+service/puppetdb   ClusterIP   10.0.232.39   <none>        8080/TCP,8081/TCP   31m
 
 NAME                           READY   UP-TO-DATE   AVAILABLE   AGE
-deployment.apps/postgres       1/1     1            1           10m
-deployment.apps/puppetboard    1/1     1            1           10m
-deployment.apps/puppetdb       1/1     1            1           10m
-deployment.apps/puppetserver   1/1     1            1           10m
+deployment.apps/postgres       1/1     1            1           31m
+deployment.apps/puppetdb       1/1     1            1           31m
+deployment.apps/puppetserver   1/1     1            1           31m
 
 NAME                                      DESIRED   CURRENT   READY   AGE
-replicaset.apps/postgres-77cfcbf9f        1         1         1       10m
-replicaset.apps/puppetboard-7677f4b747    1         1         1       10m
-replicaset.apps/puppetdb-85c799d8fb       1         1         1       10m
-replicaset.apps/puppetserver-6d48cb454b   1         1         1       10m
+replicaset.apps/postgres-584d75d8b        1         1         1       31m
+replicaset.apps/puppetdb-5f6fd6df7d       1         1         1       31m
+replicaset.apps/puppetserver-54f889b9c5   1         1         1       31m
+
+NAME                               COMPLETIONS   DURATION   AGE
+job.batch/r10k-deploy-1573860480   1/1           3s         6m6s
+job.batch/r10k-deploy-1573860600   1/1           3s         4m6s
+job.batch/r10k-deploy-1573860720   1/1           3s         2m6s
+job.batch/r10k-deploy-1573860840   1/1           3s         6s
 
 NAME                        SCHEDULE      SUSPEND   ACTIVE   LAST SCHEDULE   AGE
-cronjob.batch/r10k-deploy   */2 * * * *   False     0        40s             10m
+cronjob.batch/r10k-deploy   */2 * * * *   False     1        14s             31m
 ```
 
 ## Configuration
@@ -88,7 +95,9 @@ Parameter | Description | Default
 --------- | ----------- | -------
 `puppetserver.name` | puppetserver component label | `puppetserver`
 `puppetserver.image` | puppetserver image | `puppet/puppetserver`
-`puppetserver.tag` | puppetserver img tag | `6.6.0`
+`puppetserver.tag` | puppetserver img tag | `6.7.1`
+`puppetserver.resources` | puppetserver resource limits | ``
+`puppetserver.extraEnv` | puppetserver additional container env vars | ``
 `puppetserver.pullPolicy` | puppetserver img pull policy | `IfNotPresent`
 `puppetserver.fqdns.alternateServerNames` | puppetserver alternate fqdns |``
 `puppetserver.service.type` | puppetserver svc type | `ClusterIP`
@@ -104,9 +113,12 @@ Parameter | Description | Default
 `puppetserver.puppeturl`| puppetserver control repo url |``
 `r10k.name` | r10k component label | `r10k`
 `r10k.image` | r10k img | `puppet/r10k`
-`r10k.tag` | r10k img tag | `3.3.1`
+`r10k.tag` | r10k img tag | `3.3.3`
 `r10k.pullPolicy` | r10k img pull policy | `IfNotPresent`
 `r10k.cronJob.schedule` | r10k cron job schedule policy | `*/2 * * * *`
+`r10k.resources` | r10k resource limits | ``
+`r10k.extraArgs` | r10k additional container env args | ``
+`r10k.extraEnv` | r10k additional container env vars | ``
 `r10k.viaHttps.enabled` | r10k repo cloning via https | `true`
 `r10k.viaHttps.credentials.username`| r10k https username |``
 `r10k.viaHttps.credentials.password`| r10k https password |``
@@ -119,10 +131,14 @@ Parameter | Description | Default
 `postgres.image` | postgres img | `postgres`
 `postgres.tag` | postgres img tag | `9.6.15`
 `postgres.pullPolicy` | postgres img pull policy | `IfNotPresent`
+`postgres.resources` | postgres resource limits | ``
+`postgres.extraEnv` | postgres additional container env vars | ``
 `puppetdb.name` | puppetdb component label | `puppetdb`
 `puppetdb.image` | puppetdb img | `puppet/puppetdb`
-`puppetdb.tag` | puppetdb img tag | `6.6.0`
+`puppetdb.tag` | puppetdb img tag | `6.7.3`
 `puppetdb.pullPolicy` | puppetdb img pull policy | `IfNotPresent`
+`puppetdb.resources` | puppetdb resource limits | ``
+`puppetdb.extraEnv` | puppetdb additional container env vars | ``
 `puppetdb.credentials.username`| puppetdb username |`puppetdb`
 `puppetdb.credentials.value.password`| puppetdb password |`20-char randomly generated`
 `puppetdb.credentials.password.existingSecret`| k8s secret that holds puppetdb password |``
@@ -132,6 +148,8 @@ Parameter | Description | Default
 `puppetboard.image` | puppetboard img | `puppet/puppetboard`
 `puppetboard.tag` | puppetboard img tag | `0.3.0`
 `puppetboard.pullPolicy` | puppetboard img pull policy | `IfNotPresent`
+`puppetboard.resources` | puppetboard resource limits | ``
+`puppetboard.extraEnv` | puppetboard additional container env vars | ``
 `hiera.name` | hiera component label | `hiera`
 `hiera.hieradataurl`| hieradata repo url |``
 `hiera.config`| hieradata yaml config |``

templates/postgres-deployment.yaml

@@ -27,6 +27,10 @@ spec:
           resources:
           {{ toYaml .Values.puppetserver.resources | nindent 12 }}
           env:
+            {{- range $key, $value := .Values.postgres.extraEnv }}
+            - name: {{ $key }}
+              value: {{ $value }}
+            {{- end }}
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:

templates/puppetboard-deployment.yaml

@@ -29,6 +29,10 @@ spec:
           {{ toYaml .Values.puppetserver.resources | nindent 12 }}
           ports:
           env:
+            {{- range $key, $value := .Values.puppetboard.extraEnv }}
+            - name: {{ $key }}
+              value: {{ $value }}
+            {{- end }}
             - name: "PUPPETDB_HOST"
               value: "puppetdb"
             - name: "PUPPETDB_PORT"

templates/puppetdb-deployment.yaml

@@ -27,6 +27,10 @@ spec:
           resources:
           {{ toYaml .Values.puppetserver.resources | nindent 12 }}
           env:
+            {{- range $key, $value := .Values.puppetdb.extraEnv }}
+            - name: {{ $key }}
+              value: {{ $value }}
+            {{- end }}
             - name: PUPPETSERVER_HOSTNAME
               value: "puppet"
             - name: PUPPETDB_POSTGRES_HOSTNAME

templates/puppetserver-deployment.yaml

@@ -81,6 +81,10 @@ spec:
           resources:
           {{ toYaml .Values.puppetserver.resources | nindent 12 }}
           env:
+            {{- range $key, $value := .Values.puppetserver.extraEnv }}
+            - name: {{ $key }}
+              value: {{ $value }}
+            {{- end }}
             # necessary to set certname and server in puppet.conf, required by
             # puppetserver ca cli application
             - name: PUPPETSERVER_HOSTNAME

templates/r10k-cronjob.yaml

@@ -27,11 +27,19 @@ spec:
               imagePullPolicy: "{{.Values.r10k.pullPolicy}}"
               resources:
               {{ toYaml .Values.r10k.resources | nindent 16 }}
+              env:
+                {{- range $key, $value := .Values.r10k.extraEnv }}
+                - name: {{ $key }}
+                  value: {{ $value }}
+                {{- end }}
               args:
-              - deploy
-              - environment
-              - --config
-              - /etc/puppetlabs/puppet/r10k.yaml
+                - deploy
+                - environment
+                - --config
+                - /etc/puppetlabs/puppet/r10k.yaml
+                {{- range $key, $value := .Values.r10k.extraArgs }}
+                - {{ $key }} {{ $value }}
+                {{- end }}
               volumeMounts:
                 {{- if and (.Values.r10k.viaSsh.enabled) (.Values.r10k.viaSsh.credentials.ssh.value) (.Values.r10k.viaSsh.credentials.known_hosts.value) }}
                 - name: r10k-secret

values.yaml

@@ -16,6 +16,8 @@ puppetserver:
   #  limits:
   #    memory: 768Mi
   #    cpu: 750m
+  ## Additional puppetserver container environment variables
+  extraEnv: {}
   ## Fully qualified domain names (FQDN's) to register
   ## the Puppet Server to be internally reachable via DNS.
   ## That is necessary to configure "certname" and "server" in `puppet.conf`.
@@ -83,6 +85,13 @@ r10k:
   #    cpu: 500m
   cronJob:
     schedule: "*/2 * * * *"
+  ## Additional r10k container arguments
+  extraArgs: {}
+  # --verbose[=<value>]
+  # --trace
+  # --color
+  ## Additional puppetserver container environment variables
+  extraEnv: {}
   ## Cloning via HTTPS method and its creds (if a private repo)
   ##
   viaHttps:
@@ -125,6 +134,8 @@ postgres:
   #  limits:
   #    memory: 768Mi
   #    cpu: 750m
+  ## Additional puppetserver container environment variables
+  extraEnv: {}
   ## "credentials" section is going to be added when
   ## this bug with the PuppetDB Docker image is resolved.
   ## Gitissue:
@@ -134,7 +145,7 @@ postgres:
 puppetdb:
   name: puppetdb
   image: puppet/puppetdb
-  tag: 6.7.2
+  tag: 6.7.3
   pullPolicy: IfNotPresent
   resources: {}
   #  requests:
@@ -143,6 +154,9 @@ puppetdb:
   #  limits:
   #    memory: 768Mi
   #    cpu: 750m
+  ## Additional puppetserver container environment variables
+  extraEnv: {}
+  ## Credentials for PuppetDB and PostgreSQL
   credentials:
     username: puppetdb
     ## Override the 20-char random "password" in templates/puppetdb-secret.yaml
@@ -167,6 +181,8 @@ puppetboard:
   #  limits:
   #    memory: 768Mi
   #    cpu: 500m
+  ## Additional puppetserver container environment variables
+  extraEnv: {}
 
 ## Hiera Configuration for Puppet Server
 ##