Merge pull request #42 from stakater-charts/refactor-templates

Make additional templates/resources optional
stakater · Jul 3, 2020 · c609475 · c609475
2 parents b4749ab + 67540c9
commit c609475
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 3 deletions.
diff --git a/application/templates/configmap.yaml b/application/templates/configmap.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.configMap .Values.configMap.enabled }}
+{{- if .Values.configMap }}
+{{- if .Values.configMap.enabled }}
 {{- range .Values.configMap.files }}
 apiVersion: v1
 kind: ConfigMap
@@ -22,4 +23,5 @@ data:
 {{ toYaml .data | indent 2 }}
 ---
 {{- end }}
+{{- end }}
 {{- end }}
diff --git a/application/templates/forecastle.yaml b/application/templates/forecastle.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.forecastle }}
 {{- if and (or .Values.ingress.enabled .Values.route.enabled) .Values.forecastle.enabled }}
 apiVersion: forecastle.stakater.com/v1alpha1
 kind: ForecastleApp
@@ -26,4 +27,5 @@ spec:
   properties:
 {{ toYaml .Values.forecastle.properties | indent 4 }}
   {{- end }}
+{{- end -}}
 {{- end -}}
diff --git a/application/templates/hpa.yaml b/application/templates/hpa.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.autoscaling }}
 {{- if and .Values.autoscaling.enabled .Values.deployment }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
@@ -22,4 +23,5 @@ spec:
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
     {{- toYaml .Values.autoscaling.metrics | nindent 4 }}
-{{- end }}    
+{{- end }}
+{{- end }}
diff --git a/application/templates/ingress.yaml b/application/templates/ingress.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ingress -}}
 {{- if .Values.ingress.enabled -}}
 {{- $servicePort := .Values.ingress.servicePort -}}
 apiVersion: extensions/v1beta1
@@ -30,3 +31,4 @@ spec:
 {{ toYaml .Values.ingress.tls | indent 4 }}
   {{- end -}}
 {{- end -}}
+{{- end -}}
diff --git a/application/templates/pvc.yaml b/application/templates/pvc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.persistence }}
 {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -26,4 +27,5 @@ spec:
   storageClassName: "{{ .Values.persistence.storageClass }}"
 {{- end }}
 {{- end }}
+{{- end }}
 {{- end }}
diff --git a/application/templates/route.yaml b/application/templates/route.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.route -}}
 {{- if .Values.route.enabled -}}
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -28,3 +29,4 @@ spec:
     termination: {{ .Values.route.tls.termination }}
     insecureEdgeTerminationPolicy: {{ .Values.route.tls.insecureEdgeTerminationPolicy }}
 {{- end -}}
+{{- end -}}
diff --git a/application/templates/secret.yaml b/application/templates/secret.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.secret .Values.secret.enabled }}
+{{- if .Values.secret }}
+{{- if .Values.secret.enabled }}
 {{- range .Values.secret.files }}
 apiVersion: v1
 kind: Secret
@@ -24,4 +25,5 @@ data:
 {{- end }}
 ---
 {{- end }}
+{{- end }}
 {{- end }}
diff --git a/application/templates/servicemonitor.yaml b/application/templates/servicemonitor.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.serviceMonitor }}
 {{- if .Values.serviceMonitor.enabled }}
 apiVersion: "monitoring.coreos.com/v1"
 kind: ServiceMonitor
@@ -24,4 +25,5 @@ spec:
     - {{ .Release.Namespace }}
   endpoints:
 {{ toYaml .Values.serviceMonitor.endpoints | indent 4 }}
+{{- end }}
 {{- end }}