feat: switch puppetboard to openvoxview

templates/_helpers.tpl

@@ -113,13 +113,13 @@ app.kubernetes.io/component: {{ .Values.puppetdb.name }}
 {{ include "puppetserver.common.matchLabels" . }}
 {{- end -}}
 
-{{- define "puppetserver.puppetboard.labels" -}}
-{{ include "puppetserver.puppetboard.matchLabels" . }}
+{{- define "puppetserver.openvoxview.labels" -}}
+{{ include "puppetserver.openvoxview.matchLabels" . }}
 {{ include "puppetserver.common.metaLabels" . }}
 {{- end -}}
 
-{{- define "puppetserver.puppetboard.matchLabels" -}}
-app.kubernetes.io/component: {{ .Values.puppetboard.name }}
+{{- define "puppetserver.openvoxview.matchLabels" -}}
+app.kubernetes.io/component: {{ .Values.openvoxview.name }}
 {{ include "puppetserver.common.matchLabels" . }}
 {{- end -}}
 

templates/puppetboard-ingress.yaml → templates/openvoxview-ingress.yaml

@@ -1,31 +1,31 @@
-{{- if and .Values.puppetboard.enabled .Values.puppetboard.ingress.enabled }}
+{{- if and .Values.openvoxview.enabled .Values.openvoxview.ingress.enabled }}
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := ( include "puppetdb.fullname" . ) }}
-{{- $servicePort := .Values.puppetboard.port -}}
-{{- $pathType := .Values.puppetboard.ingress.pathType | default "ImplementationSpecific" -}}
+{{- $servicePort := .Values.openvoxview.port -}}
+{{- $pathType := .Values.openvoxview.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 }}
+  {{- if .Values.openvoxview.ingress.annotations }}
   annotations:
-    {{ toYaml .Values.puppetboard.ingress.annotations | nindent 4 }}
+    {{ toYaml .Values.openvoxview.ingress.annotations | nindent 4 }}
   {{- end }}
   labels:
     {{- include "puppetserver.puppetdb.labels" . | nindent 4 }}
-    {{- range $key, $value := .Values.puppetboard.ingress.extraLabels }}
+    {{- range $key, $value := .Values.openvoxview.ingress.extraLabels }}
     {{ $key }}: {{ $value }}
     {{- end }}
-  name: {{ template "puppetdb.fullname" . }}-puppetboard
+  name: {{ template "puppetdb.fullname" . }}-openvoxview
 spec:
   {{- if $apiIsStable }}
-  {{- if .Values.puppetboard.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.puppetboard.ingress.ingressClassName }}
+  {{- if .Values.openvoxview.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.openvoxview.ingress.ingressClassName }}
   {{- end }}
   {{- end }}
   rules:
-    {{- range .Values.puppetboard.ingress.hosts }}
+    {{- range .Values.openvoxview.ingress.hosts }}
     {{- $url := splitList "/" . }}
     - host: {{ first $url }}
       http:
@@ -45,8 +45,8 @@ spec:
               servicePort: {{ $servicePort }}
               {{- end }}
     {{- end -}}
-  {{- if .Values.puppetboard.ingress.tls }}
+  {{- if .Values.openvoxview.ingress.tls }}
   tls:
-    {{ toYaml .Values.puppetboard.ingress.tls | nindent 4 }}
+    {{ toYaml .Values.openvoxview.ingress.tls | nindent 4 }}
   {{- end -}}
 {{- end -}}

templates/puppetdb-deployment.yaml

@@ -166,35 +166,32 @@ spec:
             {{- end }}
           securityContext:
             {{- toYaml .Values.puppetdb.securityContext | nindent 12 }}
-        {{- if .Values.puppetboard.enabled }}
-        - name: puppetboard
-          image: "{{.Values.puppetboard.image}}:{{.Values.puppetboard.tag}}"
-          imagePullPolicy: "{{.Values.puppetboard.pullPolicy}}"
+        {{- if .Values.openvoxview.enabled }}
+        - name: openvoxview
+          image: "{{.Values.openvoxview.image}}:{{.Values.openvoxview.tag}}"
+          imagePullPolicy: "{{.Values.openvoxview.pullPolicy}}"
           resources:
-            {{- toYaml .Values.puppetboard.resources | nindent 12 }}
+            {{- toYaml .Values.openvoxview.resources | nindent 12 }}
           env:
+            - name: PUPPETDB_TLS
+              value: true
+            - name: PUPPETDB_TLS_CA
+              value: "/opt/puppetlabs/server/data/puppetdb/certs/certs/ca.pem"
+            - name: PUPPETDB_TLS_KEY
+              value: "/opt/puppetlabs/server/data/puppetdb/certs/private_keys/openvoxdb.pem"
+            - name: PUPPETDB_TLS_CERT
+              value: "/opt/puppetlabs/server/data/puppetdb/certs/certs/openvoxdb.pem"
             - name: PUPPETDB_HOST
               value: {{ if .Values.singleCA.enabled}}{{.Values.singleCA.puppetdb.overrideHostname}}{{ else }}{{ ( include "puppetdb.fullname" . ) }}{{ end }}
             - name: PUPPETDB_PORT
               value: "8081"
-            - name: PUPPETDB_SSL_VERIFY
-              value: "/opt/puppetlabs/server/data/puppetdb/certs/certs/ca.pem"
-            - name: PUPPETDB_CERT
-              value: "/opt/puppetlabs/server/data/puppetdb/certs/certs/openvoxdb.pem"
-            - name: PUPPETDB_KEY
-              value: "/opt/puppetlabs/server/data/puppetdb/certs/private_keys/openvoxdb.pem"
-            - name: PUPPETBOARD_PORT
-              value: {{ .Values.puppetboard.port | quote }}
-            - name: SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "puppetdb.fullname" . }}-puppetboard
-                  key: SECRET_KEY
+            - name: PORT
+              value: {{ .Values.openvoxview.port | quote }}
             {{- range $key, $value := .Values.global.extraEnv }}
             - name: {{ $key }}
               value: "{{ $value }}"
             {{- end }}
-            {{- range $key, $value := .Values.puppetboard.extraEnv }}
+            {{- range $key, $value := .Values.openvoxview.extraEnv }}
             - name: {{ $key }}
               value: "{{ $value }}"
             {{- end }}
@@ -203,15 +200,15 @@ spec:
             - secretRef:
                 name: {{ .Values.global.extraEnvSecret }}
           {{- end }}
-          {{- if .Values.puppetboard.extraEnvSecret }}
+          {{- if .Values.openvoxview.extraEnvSecret }}
             - secretRef:
-                name: {{ .Values.puppetboard.extraEnvSecret }}
+                name: {{ .Values.openvoxview.extraEnvSecret }}
           {{- end }}
           ports:
-            - name: puppetboard
-              containerPort: {{ .Values.puppetboard.port }}
+            - name: openvoxview
+              containerPort: {{ .Values.openvoxview.port }}
           securityContext:
-            {{- toYaml .Values.puppetboard.securityContext | nindent 12 }}
+            {{- toYaml .Values.openvoxview.securityContext | nindent 12 }}
             runAsUser: {{ .Values.global.securityContext.runAsUser }}
             runAsGroup: {{ .Values.global.securityContext.runAsGroup }}
           volumeMounts:

templates/puppetdb-secret.yaml

@@ -11,19 +11,4 @@ data:
   username: {{ .Values.global.postgresql.auth.username | b64enc | quote }}
   password: {{ .Values.global.postgresql.auth.password | b64enc | quote }}
 {{- end }}
----
-{{- if .Values.puppetboard.enabled }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "puppetdb.fullname" . }}-puppetboard
-type: Opaque
-data:
-  {{- $secret := lookup "v1" "Secret" .Release.Namespace "puppetdb-puppetboard" }}
-  {{- if $secret }}
-  SECRET_KEY: {{ $secret.data.SECRET_KEY }}
-  {{- else }}
-  SECRET_KEY: {{ randAlphaNum 64 | b64enc | quote }}
-  {{- end }}
-{{- end }}
 {{- end }}

templates/puppetdb-service.yaml

@@ -20,10 +20,10 @@ spec:
     - name: pdb-https
       port: 8081
       targetPort: pdb-https
-    {{- if .Values.puppetboard.enabled }}
-    - name: puppetboard
-      port: {{ .Values.puppetboard.port }}
-      targetPort: {{ .Values.puppetboard.service.targetPort }}
+    {{- if .Values.openvoxview.enabled }}
+    - name: openvoxview
+      port: {{ .Values.openvoxview.port }}
+      targetPort: {{ .Values.openvoxview.service.targetPort }}
     {{- end }}
     {{- if .Values.metrics.prometheus.enabled }}
     - name: metrics

values.yaml

@@ -929,30 +929,30 @@ postgresql:
 
 ## Puppetboard Configuration
 ##
-puppetboard:
+openvoxview:
   enabled: false
-  name: puppetboard
-  image: ghcr.io/voxpupuli/puppetboard
-  tag: 6.0.0
+  name: openvoxview
+  image: ghcr.io/voxpupuli/openvoxview
+  tag: v0.1.26
   port: 9090
   pullPolicy: IfNotPresent
   service:
-    targetPort: puppetboard
+    targetPort: openvoxview
   resources: {}
   #  requests:
   #    memory: 368Mi
   #    cpu: 300m
   #  limits:
   #    memory: 640Mi
   #    cpu: 500m
-  ## Additional puppetboard container environment variables
+  ## Additional openvoxview container environment variables
   ##
   extraEnv: {}
   #  ENABLE_CATALOG: True
   #  ENABLE_QUERY: True
   #  INVENTORY_FACTS: Hostname,fqdn,IP Address,ipaddress
   #  GRAPH_FACTS: architecture,puppetversion,osfamily
-  ## Additional puppetboard container environment variables from a pre-existing K8s secret
+  ## Additional openvoxview container environment variables from a pre-existing K8s secret
   extraEnvSecret: ""
   securityContext:
     runAsNonRoot: true
@@ -975,15 +975,15 @@ puppetboard:
     ## Must be provided if Ingress is enabled
     ##
     hosts: []
-    #   - puppetboard.domain.com
-    #   - domain.com/puppetboard
+    #   - openvoxview.domain.com
+    #   - domain.com/openvoxview
     ## Puppetboard Ingress TLS configuration
     ## Secrets must be manually created in the namespace
     ##
     tls: []
-    #   - secretName: puppetboard-server-tls
+    #   - secretName: openvoxview-server-tls
     #     hosts:
-    #       - puppetboard.domain.com
+    #       - openvoxview.domain.com
 
 ## Hiera Configuration for Puppet Server
 ##