Merge pull request #29 from brjos/master

[manifests]: fix: add newline indents
bedag · Jan 26, 2021 · b090218 · b090218
2 parents ba60447 + 5e6f95b
commit b090218
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/charts/manifests/Chart.yaml b/charts/manifests/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: manifests
 description: "Bedag's Manifest chart. Library full of basic kubernetes manifests."
 type: library
-version: 0.4.10
+version: 0.4.11
 icon: "https://www.bedag.ch/wGlobal/wGlobal/layout/images/logo.svg"
 keywords:
 - Bedag
@@ -22,4 +22,4 @@ annotations:
   artifacthub.io/prerelease: "true"
   artifacthub.io/license: Apache-2.0
   artifacthub.io/changes: |
-    - "[Fixed]: Pod missing name in metadata"
+    - add newlines to prevent parse errors
diff --git a/charts/manifests/README.md b/charts/manifests/README.md
@@ -1,6 +1,6 @@
 # Manifests Library
 
-![Version: 0.4.10](https://img.shields.io/badge/Version-0.4.10-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 0.4.11](https://img.shields.io/badge/Version-0.4.11-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 This library's purpose is to have more flexibility as chart author but at the same time have kubernetes manifests managed in a central library. This way you can avoid big surprises when Kubernetes has breaking changes in any of their APIs. Currently we support a base set of resources. Resources may be added as soon as we see or get a request that there's a need for it. This chart is still under development and testing, since it's rather complex. Feel free to use it. Our goal is to get it as reliable as possible.
 

diff --git a/charts/manifests/templates/manifests/_daemonset.tpl b/charts/manifests/templates/manifests/_daemonset.tpl
@@ -36,7 +36,7 @@ spec:
   minReadySeconds: {{ default 0 $daemonset.minReadySeconds }}
   revisionHistoryLimit: {{ default 10 $daemonset.revisionHistoryLimit }}
   selector:
-    matchLabels: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $context) $daemonset.selectorLabels) "context" $context) | indent 6 }}
+    matchLabels: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $context) $daemonset.selectorLabels) "context" $context) | nindent 6 }}
   template: {{- include "bedag-lib.template.pod" (set . "pod" $daemonset) | nindent 4 }}
   updateStrategy:
     {{- $updateStrategy := (default "RollingUpdate" $daemonset.updateStrategy) }}

diff --git a/charts/manifests/templates/manifests/_networkPolicy.tpl b/charts/manifests/templates/manifests/_networkPolicy.tpl
@@ -35,7 +35,7 @@ metadata:
   labels: {{- include "lib.utils.common.labels" (dict "labels" $networkPolicy.labels "context" $context)| nindent 4 }}
 spec:
   podSelector:
-    matchLabels: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $context) $networkPolicy.selector) "context" $context) | indent 6 }}
+    matchLabels: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $context) $networkPolicy.selector) "context" $context) | nindent 6 }}
       {{- if or $networkPolicy.ingress $networkPolicy.egress}}
   policyTypes:
         {{- if and $networkPolicy.ingress (kindIs "slice" $networkPolicy.ingress) }}

diff --git a/charts/manifests/templates/manifests/_statefulset.tpl b/charts/manifests/templates/manifests/_statefulset.tpl
@@ -45,7 +45,7 @@ spec:
     {{- end }}
   replicas: {{ default "1" $statefulset.replicaCount }}
   selector:
-    matchLabels: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $context) $statefulset.selectorLabels) "context" $context) | indent 6 }}
+    matchLabels: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $context) $statefulset.selectorLabels) "context" $context) | nindent 6 }}
   serviceName: {{ default (include "bedag-lib.utils.common.fullname" .) $statefulset.serviceName }}
   {{- if $statefulset.statefulsetExtras }}
     {{- toYaml $statefulset.statefulsetExtras | nindent 2 }}

diff --git a/charts/manifests/templates/manifests/templates/_podTpl.tpl b/charts/manifests/templates/manifests/templates/_podTpl.tpl
@@ -41,7 +41,7 @@ spec:
     {{- end }}
     {{- $pullSecrets := include "lib.utils.globals.imagePullSecrets" (dict "pullSecrets" $values.imagePullSecrets "context" $context) }}
     {{- if $pullSecrets }}
-  imagePullSecrets: {{- toYaml $pullSecrets | indent 4 }}
+  imagePullSecrets: {{- toYaml $pullSecrets | nindent 4 }}
     {{- end }}
     {{- with $values.affinity }}
   affinity: {{- include "lib.utils.strings.template" (dict "value" . "context" $context) | nindent 4 }}

diff --git a/charts/manifests/templates/presets/components/_jmxexporter.tpl b/charts/manifests/templates/presets/components/_jmxexporter.tpl
@@ -122,6 +122,6 @@ serviceMonitor:
     {{- end }}
   labels: {{ toYaml $.values.labels | nindent 4 }}
     manifests.bedag/component: {{ $name }}
-  selector: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $.context) $.values.serviceMonitor.selector) "context" $.context) | indent 4 }}
+  selector: {{- include "lib.utils.strings.template" (dict "value" (default (include "lib.utils.common.selectorLabels" $.context) $.values.serviceMonitor.selector) "context" $.context) | nindent 4 }}
     manifests.bedag/component: {{ $name }}
 {{- end }}