Merge pull request #15 from iAnomaly/optional-deployment

Allow deployment to be optional
coredns · Mar 17, 2021 · c1edbbb · c1edbbb
2 parents 72121b9 + c58c7a7
commit c1edbbb
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 82 deletions.
diff --git a/stable/coredns/README.md b/stable/coredns/README.md
diff --git a/stable/coredns/templates/clusterrole.yaml b/stable/coredns/templates/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if and .Values.deployment.enabled .Values.rbac.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/stable/coredns/templates/clusterrolebinding.yaml b/stable/coredns/templates/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if and .Values.deployment.enabled .Values.rbac.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

diff --git a/stable/coredns/templates/configmap.yaml b/stable/coredns/templates/configmap.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.deployment.enabled }}
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -31,3 +33,4 @@ data:
   {{- range .Values.zoneFiles }}
   {{ .filename }}: {{ toYaml .contents | indent 4 }}
   {{- end }}
+{{- end }}
diff --git a/stable/coredns/templates/deployment-autoscaler.yaml b/stable/coredns/templates/deployment-autoscaler.yaml
@@ -71,7 +71,7 @@ spec:
           - /cluster-proportional-autoscaler
           - --namespace={{ .Release.Namespace }}
           - --configmap={{ template "coredns.fullname" . }}-autoscaler
-          - --target=Deployment/{{ template "coredns.fullname" . }}
+          - --target=Deployment/{{ default (include "coredns.fullname" .) .Values.deployment.name }}
           - --logtostderr=true
           - --v=2
 {{- end }}
diff --git a/stable/coredns/templates/deployment.yaml b/stable/coredns/templates/deployment.yaml
@@ -1,7 +1,9 @@
+{{- if .Values.deployment.enabled }}
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "coredns.fullname" . }}
+  name: {{ default (include "coredns.fullname" .) .Values.deployment.name }}
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
@@ -145,3 +147,4 @@ spec:
 {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | indent 8 }}
 {{- end }}
+{{- end }}
diff --git a/stable/coredns/templates/hpa.yaml b/stable/coredns/templates/hpa.yaml
@@ -21,9 +21,9 @@ spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ template "coredns.fullname" . }}
+    name: {{ default (include "coredns.fullname" .) .Values.deployment.name }}
   minReplicas: {{ .Values.hpa.minReplicas }}
   maxReplicas: {{ .Values.hpa.maxReplicas }}
   metrics:
 {{ toYaml .Values.hpa.metrics | indent 4 }}
-{{- end }}
+{{- end }}
diff --git a/stable/coredns/templates/poddisruptionbudget.yaml b/stable/coredns/templates/poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.podDisruptionBudget -}}
+{{- if and .Values.deployment.enabled .Values.podDisruptionBudget -}}
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:

diff --git a/stable/coredns/templates/podsecuritypolicy.yaml b/stable/coredns/templates/podsecuritypolicy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.pspEnable }}
+{{- if and .Values.deployment.enabled .Values.rbac.pspEnable }}
 {{ if .Capabilities.APIVersions.Has "policy/v1beta1" }}
 apiVersion: policy/v1beta1
 {{ else }}

diff --git a/stable/coredns/templates/service-metrics.yaml b/stable/coredns/templates/service-metrics.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.prometheus.service.enabled }}
+{{- if and .Values.deployment.enabled .Values.prometheus.service.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/stable/coredns/templates/service.yaml b/stable/coredns/templates/service.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.deployment.enabled }}
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -40,3 +42,4 @@ spec:
   ports:
 {{ include "coredns.servicePorts" . | indent 2 -}}
   type: {{ default "ClusterIP" .Values.serviceType }}
+{{- end }}
diff --git a/stable/coredns/templates/serviceaccount.yaml b/stable/coredns/templates/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccount.create }}
+{{- if and .Values.deployment.enabled .Values.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/stable/coredns/templates/servicemonitor.yaml b/stable/coredns/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.prometheus.monitor.enabled }}
+{{- if and .Values.deployment.enabled .Values.prometheus.monitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/stable/coredns/values.yaml b/stable/coredns/values.yaml
@@ -274,3 +274,7 @@ autoscaler:
     ## Annotations for the coredns-autoscaler configmap
     # i.e. strategy.spinnaker.io/versioned: "false" to ensure configmap isn't renamed
     annotations: {}
+
+deployment:
+  enabled: true
+  name: ""