feat(helm): disable engine install by default

infrahq · Mar 17, 2022 · 416239d · 416239d
1 parent fb9b646
commit 416239d
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 16 deletions.
diff --git a/helm/charts/infra/templates/NOTES.txt b/helm/charts/infra/templates/NOTES.txt
@@ -48,7 +48,7 @@
 
 {{- end }}
 {{- end }}
-{{- else if .Values.engine.enabled }}
+{{- else if include "engine.enabled" . | eq "true" }}
 
 {{- if not .Values.engine.config.name }}
 

diff --git a/helm/charts/infra/templates/engine/_helpers.tpl b/helm/charts/infra/templates/engine/_helpers.tpl
@@ -157,3 +157,10 @@ existing secret and use its password. If the secret does not exist, randomly gen
 {{- end }}
 {{- end }}
 {{- end }}
+
+{{/*
+Infer whether Infra engine should be deployed based on engine.enabled, engine.config.server, and engine.config.accessKey.
+*/}}
+{{- define "engine.enabled" -}}
+{{- or .Values.engine.enabled (not (empty .Values.engine.config.server)) (not (empty .Values.engine.config.accessKey)) }}
+{{- end }}
diff --git a/helm/charts/infra/templates/engine/clusterrole.yaml b/helm/charts/infra/templates/engine/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/helm/charts/infra/templates/engine/clusterrolebinding.yaml b/helm/charts/infra/templates/engine/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

diff --git a/helm/charts/infra/templates/engine/configmap.yaml b/helm/charts/infra/templates/engine/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/helm/charts/infra/templates/engine/deployment.yaml b/helm/charts/infra/templates/engine/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/helm/charts/infra/templates/engine/persistentvolumeclaim.yaml b/helm/charts/infra/templates/engine/persistentvolumeclaim.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 {{- if .Values.engine.persistence.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim

diff --git a/helm/charts/infra/templates/engine/secret.yaml b/helm/charts/infra/templates/engine/secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 {{- $accessKey := default "" .Values.engine.config.accessKey -}}
 {{- if or (not $accessKey) (and (not (hasPrefix "file:" $accessKey)) (not (hasPrefix "env:" $accessKey))) }}
 apiVersion: v1

diff --git a/helm/charts/infra/templates/engine/service.yaml b/helm/charts/infra/templates/engine/service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/helm/charts/infra/templates/engine/serviceaccount.yaml b/helm/charts/infra/templates/engine/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 {{- if .Values.engine.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount

diff --git a/helm/charts/infra/templates/engine/servicemetrics.yaml b/helm/charts/infra/templates/engine/servicemetrics.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 {{- if .Values.engine.metrics.enabled }}
 apiVersion: v1
 kind: Service

diff --git a/helm/charts/infra/templates/engine/servicemonitor.yaml b/helm/charts/infra/templates/engine/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 {{- if and .Values.engine.metrics.enabled .Values.engine.metrics.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1

diff --git a/helm/charts/infra/templates/server/_helpers.tpl b/helm/charts/infra/templates/server/_helpers.tpl
@@ -142,7 +142,7 @@ If global value is present, use global value. Otherwise, use local value.
 {{- end }}
 
 {{/*
-Infer whether server should be deployed based on server.enabled and engine.config.server.
+Infer whether Infra server should be deployed based on server.enabled and engine.config.server.
 */}}
 {{- define "server.enabled" -}}
 {{- and .Values.server.enabled (not .Values.engine.config.server) }}

diff --git a/helm/charts/infra/templates/server/configmap.yaml b/helm/charts/infra/templates/server/configmap.yaml
@@ -30,7 +30,7 @@ data:
     adminAccessKey: {{ $adminAccessKey }}
 {{- end }}
 
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
 {{- $accessKey := default "" .Values.engine.config.accessKey }}
 {{- if and $accessKey (or (hasPrefix "file:" $accessKey) (hasPrefix "env:" $accessKey)) }}
     accessKey: {{ $accessKey }}

diff --git a/helm/charts/infra/templates/server/deployment.yaml b/helm/charts/infra/templates/server/deployment.yaml
@@ -49,7 +49,7 @@ spec:
             - name: admin-access-key
               mountPath: /var/run/secrets/infrahq.com/admin-access-key
 {{- end }}
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
             - name: access-key
               mountPath: /var/run/secrets/infrahq.com/access-key
 {{- end }}
@@ -102,7 +102,7 @@ spec:
             secretName: {{ .Release.Name }}-admin-access-key
             optional: true
 {{- end }}
-{{- if .Values.engine.enabled }}
+{{- if include "engine.enabled" . | eq "true" }}
         - name: access-key
           secret:
             secretName: {{ .Release.Name }}-access-key

diff --git a/helm/charts/infra/values.yaml b/helm/charts/infra/values.yaml
@@ -442,7 +442,7 @@ server:
 engine:
 
   ## Deploy the engine
-  enabled: true
+  enabled: false
   componentName: engine
 
   ## Number of engine pods to run