Merge pull request #5437 from azhurbilo/lighthouse-disabled

Add ability to change Service type and exclude some k8s resources using vars  (Helm Chart)

contrib/chart/backstage/README.md

@@ -129,6 +129,16 @@ For the CA, create a `configMap` named `<release name>-<chart name>-postgres-ca`
 kubectl create configmap my-company-backstage-postgres-ca --from-file=ca.crt"
 ```
 
+or disable CA mount
+
+```yaml
+backend:
+  postgresCertMountEnabled: false
+
+lighthouse:
+  postgresCertMountEnabled: false
+```
+
 > Where the release name contains the chart name "backstage" then only the release name will be used.
 
 Now install the helm chart:

contrib/chart/backstage/templates/_helpers.tpl

@@ -214,7 +214,7 @@ Postgres port for the backend
 {{- .Values.postgresql.service.port }}
 {{- else if .Values.appConfig.backend.database.connection.port -}}
 {{- .Values.appConfig.backend.database.connection.port }}
-{{ else }}
+{{- else -}}
 5432
 {{- end -}}
 {{- end -}}

contrib/chart/backstage/templates/backend-deployment.yaml

@@ -56,16 +56,20 @@ spec:
                   name: {{ include "backend.postgresql.passwordSecret" .}}
                   key: postgresql-password
           volumeMounts:
+            {{- if .Values.backend.postgresCertMountEnabled }}
             - name: postgres-ca
               mountPath: {{ include "backstage.backend.postgresCaDir" . }}
+            {{- end }}
             - name: app-config
               mountPath: {{ printf "/usr/src/app/%s" (include "backstage.appConfigFilename" .) }}
               subPath: {{ include "backstage.appConfigFilename" . }}
 
       volumes:
+        {{- if .Values.backend.postgresCertMountEnabled }}
         - name: postgres-ca
           configMap:
             name: {{ include "backstage.fullname" . }}-postgres-ca
+        {{- end }}
         - name: app-config
           configMap:
             name: {{ include "backstage.fullname" . }}-app-config
@@ -90,5 +94,5 @@ spec:
     app: backstage
     component: backend
 
-  type: ClusterIP
+  type: {{ .Values.backend.serviceType }}
 {{- end }}

contrib/chart/backstage/templates/frontend-deployment.yaml

@@ -62,5 +62,5 @@ spec:
     app: backstage
     component: frontend
 
-  type: ClusterIP
+  type: {{ .Values.frontend.serviceType }}
 {{- end }}

contrib/chart/backstage/templates/lighthouse-config.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.lighthouse.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,4 +8,5 @@ data:
   PGUSER: {{ include "lighthouse.postgresql.user" . | quote }}
   PGPORT: {{ include "lighthouse.postgresql.port" . | quote }}
   PGHOST: {{ include "lighthouse.postgresql.host" . | quote }}
-  PGPATH_TO_CA: {{ include "backstage.lighthouse.postgresCaFilename" . | quote }}
+  PGPATH_TO_CA: {{ include "backstage.lighthouse.postgresCaFilename" . | quote }}
+{{- end }}

contrib/chart/backstage/templates/lighthouse-deployment.yaml

@@ -51,14 +51,18 @@ spec:
                   name: {{ include "lighthouse.postgresql.passwordSecret" . }}
                   key: postgresql-password
 
+          {{- if .Values.lighthouse.postgresCertMountEnabled }}
           volumeMounts:
             - name: postgres-ca
               mountPath: {{ include "backstage.lighthouse.postgresCaDir" . }}
+          {{- end }}
 
+      {{- if .Values.lighthouse.postgresCertMountEnabled }}
       volumes:
         - name: postgres-ca
           configMap:
             name: {{ include "backstage.fullname" . }}-postgres-ca
+      {{- end }}
 
       {{- if .Values.global.nodeSelector }}
       nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 8 }}
@@ -78,5 +82,5 @@ spec:
     app: backstage
     component: lighthouse-audit-service
 
-  type: ClusterIP
+  type: {{ .Values.lighthouse.serviceType }}
 {{- end }}

contrib/chart/backstage/templates/postgresql-password-backend-secret.yaml

@@ -0,0 +1,15 @@
+{{- if not .Values.postgresql.enabled }}
+---
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "backend.postgresql.passwordSecret" . }}
+  labels:
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+data:
+  postgresql-password: {{ .Values.appConfig.backend.database.connection.password | b64enc }}
+{{- end }}

contrib/chart/backstage/templates/postgresql-password-lighthouse-secret.yaml

@@ -1,18 +1,4 @@
-{{- if not .Values.postgresql.enabled }}
----
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ include "backend.postgresql.passwordSecret" . }}
-  labels:
-    release: {{ .Release.Name }}
-  annotations:
-    "helm.sh/hook": "pre-install,pre-upgrade"
-    "helm.sh/hook-delete-policy": "before-hook-creation"
-data:
-  postgresql-password: {{ .Values.appConfig.backend.database.connection.password | b64enc }}
-{{- end }}
+{{- if .Values.lighthouse.enabled }}
 {{- if not .Values.postgresql.enabled }}
 ---
 apiVersion: v1
@@ -28,3 +14,4 @@ metadata:
 data:
   postgresql-password: {{ .Values.lighthouse.database.connection.password | b64enc }}
 {{- end }}
+{{- end }}

contrib/chart/backstage/values.yaml

@@ -10,6 +10,7 @@ frontend:
     tag: test1
     pullPolicy: IfNotPresent
   containerPort: 80
+  serviceType: ClusterIP
   resources:
     requests:
       memory: 128Mi
@@ -26,6 +27,8 @@ backend:
     tag: 20210423T1550
     pullPolicy: IfNotPresent
   containerPort: 7000
+  serviceType: ClusterIP
+  postgresCertMountEnabled: true
   resources:
     requests:
       memory: 512Mi
@@ -40,6 +43,8 @@ lighthouse:
     tag: latest
     pullPolicy: IfNotPresent
   containerPort: 3003
+  serviceType: ClusterIP
+  postgresCertMountEnabled: true
   resources:
     requests:
       memory: 128Mi