Merge pull request #580 from joejulian/fix_indenting

fix golang template block indentations and fix a couple typos
redpanda-data · Jul 22, 2023 · c905b6f · c905b6f
2 parents d6a2112 + 36d3454
commit c905b6f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/charts/redpanda/Chart.yaml b/charts/redpanda/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # The chart version and the app version are not the same and will not track
 # together. The chart version is a semver representation of changes to this
 # chart.
-version: 5.0.0
+version: 5.0.1
 
 # The app version is the default version of Redpanda to install.
 appVersion: v23.2.2

diff --git a/charts/redpanda/templates/certs.yaml b/charts/redpanda/templates/certs.yaml
@@ -16,61 +16,61 @@ limitations under the License.
 */}}
 {{- if (include "tls-enabled" . | fromJson).bool }}
   {{- $root := deepCopy . }}
-  {{- $service := include "redpanda.fullname" . -}}
-  {{- $ns := .Release.Namespace -}}
-  {{- $domain := .Values.clusterDomain | trimSuffix "." -}}
-  {{- $listeners := .Values.listeners -}}
+  {{- $service := include "redpanda.fullname" . }}
+  {{- $ns := .Release.Namespace }}
+  {{- $domain := .Values.clusterDomain | trimSuffix "." }}
+  {{- $listeners := .Values.listeners }}
   {{- $values := .Values }}
   {{- range $name, $data := .Values.tls.certs }}
-  {{- if (empty $data.secretRef ) }}
-    {{- $d := $data.duration }}
+    {{- if (empty $data.secretRef ) }}
+      {{- $d := $data.duration }}
 
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ template "redpanda.fullname" $ }}-{{ $name }}-cert
   namespace: {{ $ns | quote }}
+      {{- with include "full.labels" $root }}
   labels:
-{{- with include "full.labels" $root }}
-  {{- . | nindent 4 }}
-{{- end }}
+        {{- . | nindent 4 }}
+      {{- end }}
 spec:
   dnsNames:
-{{- if (empty $data.issuerRef) }}
-  - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc.%s" $service $ns $domain }}
-  - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc" $service $ns }}
-  - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s" $service $ns }}
-  - "*.{{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc.%s" $service $ns $domain }}"
-  - "*.{{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc" $service $ns }}"
-  - "*.{{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s" $service $ns }}"
-  - {{ printf "%s.%s.svc.%s" $service $ns $domain }}
-  - {{ printf "%s.%s.svc" $service $ns }}
-  - {{ printf "%s.%s" $service $ns }}
-  - {{ printf "*.%s.%s.svc.%s" $service $ns $domain | quote }}
-  - {{ printf "*.%s.%s.svc" $service $ns | quote }}
-  - {{ printf "*.%s.%s" $service $ns | quote }}
-{{- end }}
-{{- if (tpl ($values.external.domain | default "") $) }}
-  - "{{ tpl $values.external.domain $ }}"
-  - "*.{{ tpl $values.external.domain $ }}"
-{{- end }}
+      {{- if (empty $data.issuerRef) }}
+    - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc.%s" $service $ns $domain }}
+    - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc" $service $ns }}
+    - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s" $service $ns }}
+    - "*.{{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc.%s" $service $ns $domain }}"
+    - "*.{{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc" $service $ns }}"
+    - "*.{{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s" $service $ns }}"
+    - {{ printf "%s.%s.svc.%s" $service $ns $domain }}
+    - {{ printf "%s.%s.svc" $service $ns }}
+    - {{ printf "%s.%s" $service $ns }}
+    - {{ printf "*.%s.%s.svc.%s" $service $ns $domain | quote }}
+    - {{ printf "*.%s.%s.svc" $service $ns | quote }}
+    - {{ printf "*.%s.%s" $service $ns | quote }}
+      {{- end }}
+      {{- if (tpl ($values.external.domain | default "") $) }}
+    - "{{ tpl $values.external.domain $ }}"
+    - "*.{{ tpl $values.external.domain $ }}"
+      {{- end }}
   duration: {{ $d | default "43800h" }}
   isCA: false
   secretName: {{ template "redpanda.fullname" $ }}-{{ $name }}-cert
   privateKey:
     algorithm: ECDSA
     size: 256
-    {{- if not (empty $data.issuerRef) }}
+      {{- if not (empty $data.issuerRef) }}
   issuerRef:
-    {{- toYaml $data.issuerRef | nindent 4 }}
+        {{- toYaml $data.issuerRef | nindent 4 }}
     group: cert-manager.io
-    {{- else }}
+      {{- else }}
   issuerRef:
     name: {{ template "redpanda.fullname" $ }}-{{ $name }}-root-issuer
     kind: Issuer
     group: cert-manager.io
-    {{- end }}
+      {{- end }}
     {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/redpanda/values.yaml b/charts/redpanda/values.yaml
@@ -203,7 +203,7 @@ external:
     # service.beta.kubernetes.io/aws-load-balancer-type: nlb
   # If you enable externalDns, each LoadBalancer service instance
   # will be annotated with external-dns hostname
-  # matchine external.addresses + external.domain
+  # matching external.addresses + external.domain
   # externalDns:
   #   enabled: true