Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 176811b

Browse files
cospeedstercospeedster
committed
chore: Remove whitespaces from chart templates
1 parent ed066f7 commit 176811b

15 files changed

+57
-59
lines changed

‎apigateway/helm/templates/_helper.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,27 +59,27 @@ Build the secret name for truststore for Elasticsearch
5959
{{- end }}
6060

6161
{{/*
62-
Renders API Gateway's password key identifier for API Gateway for the keystore. Defaults to "password" if no Value for .Values.apigw.elastic.
62+
Renders API Gateway's password key identifier for API Gateway for the keystore. Defaults to "password" if no Value for .Values.apigw.elastic.
6363
*/}}
6464
{{- define "apigateway.elastickeystoresecretPasswordKey" -}}
6565
{{- default ( printf "%s" "password" ) .Values.apigw.elastickeyStorePassKey }}
6666
{{- end }}
6767
6868
{{/*
69-
Renders API Gateway's password key identifier for API Gateway for the truststore. Defaults to "password" if no Value for .Values.apigw.elastic.
69+
Renders API Gateway's password key identifier for API Gateway for the truststore. Defaults to "password" if no Value for .Values.apigw.elastic.
7070
*/}}
7171
{{- define "apigateway.elastictruststoresecretPasswordKey" -}}
7272
{{- default ( printf "%s" "password" ) .Values.apigw.elastictruststoreStorePassKey }}
7373
{{- end }}
7474

75-
{{/*
75+
{{/*
7676
Build the tls secret name, which holds the jks trust and keystore for API Gateway to communicate with Elasticsearch
7777
*/}}
7878
{{- define "apigateway.elastictls" -}}
7979
{{- default (printf "%s%s" (include "common.names.fullname" .) "-es-tls-secret") .Values.elasticsearch.tlsSecretName }}
8080
{{- end }}
8181

82-
{{/*
82+
{{/*
8383
Build the admin secret name, which holds the Administrator password
8484
*/}}
8585
{{- define "apigateway.adminsecret" -}}

‎apigateway/helm/templates/configmap.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,18 @@ data:
3636
{{- if .Values.apigw.extraConfigSources }}
3737
{{- toYaml .Values.apigw.extraConfigSources | nindent 4 -}}
3838
{{- end }}
39-
4039
apigw-config.yml: |
41-
apigw:
40+
apigw:
4241
{{- range $key, $value := .Values.apigw.configSources }}
4342
{{- if kindIs "map" $value }}
4443
{{- printf "%s:" $key | nindent 6 }}
4544
{{- include "common.utils.renderNestedMap" (dict "map" $value "ctx" $ "depth" 8) }}
4645
{{- else if kindIs "string" $value }}
4746
{{- printf "%s: %s" $key (tpl $value $) }}
4847
{{- else if or (kindIs "bool" $value) (or (kindIs "float" $value) (kindIs "int" $value)) }}
49-
{{- printf "%s: %v" $key $value }}
48+
{{- printf "%s: %v" $key $value }}
5049
{{- end }}
5150
{{- end }}
52-
5351
{{ if .Values.apigw.applicationProperties -}}
5452
application.properties: |
5553
{{- printf "%s" (tpl .Values.apigw.applicationProperties .) | nindent 4 }}

‎apigateway/helm/templates/configmaps-extra.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ metadata:
2727
{{- with $.Values.extraLabels -}}
2828
{{ toYaml . | nindent 4 }}
2929
{{- end }}
30-
data:
31-
{{- toYaml .data | nindent 2 }}
30+
data:
31+
{{- toYaml .data | nindent 2 }}
3232
{{- end }}

‎apigateway/helm/templates/deployment.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@ spec:
6060
{{- end }}
6161
{{- if .Values.serviceAccount.create }}
6262
serviceAccountName: {{ include "common.names.serviceAccountName" . }}
63-
{{- end }}
63+
{{- end }}
6464
securityContext:
6565
{{- toYaml .Values.podSecurityContext | nindent 8 }}
6666
{{- if or ( .Values.apigw.initContainer.enabled ) ( .Values.extraInitContainers ) }}
6767
initContainers:
68-
{{- if .Values.elasticsearch.deploy }}
68+
{{- if .Values.elasticsearch.deploy }}
6969
- name: waitforelasticsearch
7070
image: {{ .Values.global.curlImage }}
7171
imagePullPolicy: IfNotPresent
72-
{{- if .Values.resources.apigwInitContainer }}
72+
{{- if .Values.resources.apigwInitContainer }}
7373
resources:
7474
{{- toYaml .Values.resources.apigwInitContainer | nindent 12 }}
7575
{{- end }}
76-
{{- if .Values.apigw.initContainer.securityContext }}
76+
{{- if .Values.apigw.initContainer.securityContext }}
7777
securityContext:
7878
{{- toYaml .Values.apigw.initContainer.securityContext | nindent 12 }}
7979
{{- end }}
@@ -148,7 +148,7 @@ spec:
148148
valueFrom:
149149
secretKeyRef:
150150
name: {{ include "apigateway.elastickeystoresecret" . }}
151-
key: {{ include "apigateway.elastickeystoresecretPasswordKey" . }}
151+
key: {{ include "apigateway.elastickeystoresecretPasswordKey" . }}
152152
- name: apigw_elasticsearch_https_truststorePassword
153153
valueFrom:
154154
secretKeyRef:
@@ -171,7 +171,7 @@ spec:
171171
- containerPort: {{ int .Values.apigw.adminPort }}
172172
name: admin-http
173173
protocol: TCP
174-
- containerPort: {{ int .Values.apigw.runtimeExternalPort }}
174+
- containerPort: {{ int .Values.apigw.runtimeExternalPort }}
175175
name: external-http
176176
protocol: TCP
177177
{{- if .Values.grpcService.enabled }}
@@ -181,7 +181,7 @@ spec:
181181
{{- end }}
182182
{{- if .Values.extraPorts }}
183183
{{- toYaml .Values.extraPorts | nindent 10 }}
184-
{{- end }}
184+
{{- end }}
185185
livenessProbe:
186186
tcpSocket:
187187
port: {{ int .Values.apigw.adminPort }}
@@ -194,7 +194,7 @@ spec:
194194
httpGet:
195195
path: /rest/apigateway/health
196196
port: {{ int .Values.apigw.adminPort }}
197-
scheme: {{ .Values.apigw.readinessProbe.scheme }}
197+
scheme: {{ .Values.apigw.readinessProbe.scheme }}
198198
failureThreshold: 3
199199
initialDelaySeconds: 30
200200
periodSeconds: 30
@@ -219,7 +219,7 @@ spec:
219219
{{- end }}
220220
{{- if .Values.extraVolumeMounts }}
221221
{{- if eq "string" (printf "%T" .Values.extraVolumeMounts) }}
222-
{{- tpl .Values.extraVolumeMounts . | nindent 12 }}
222+
{{- tpl .Values.extraVolumeMounts . | nindent 12 }}
223223
{{- else }}
224224
{{- toYaml .Values.extraVolumeMounts | nindent 12 }}
225225
{{- end }}
@@ -245,7 +245,7 @@ spec:
245245
{{- toYaml . | nindent 8 }}
246246
{{- end }}
247247
{{- if .Values.hostAliases }}
248-
hostAliases:
248+
hostAliases:
249249
{{- toYaml .Values.hostAliases | nindent 8 }}
250250
{{- end }}
251251
volumes:
@@ -258,7 +258,7 @@ spec:
258258
- key: apigw-config.yml
259259
path: apigw-config.yml
260260
- key: application.properties
261-
path: application.properties
261+
path: application.properties
262262
- name: apigw-license
263263
configMap:
264264
name: {{ include "apigateway.licenseconfigname" . }}
@@ -268,7 +268,7 @@ spec:
268268
path: licenseKey.xml
269269
{{- if .Values.elasticsearch.tlsEnabled }}
270270
- name: elastic-tls
271-
secret:
271+
secret:
272272
secretName: {{ include "apigateway.elastictls" .}}
273273
items:
274274
- key: truststore.jks

‎apigateway/helm/templates/elasticsearch.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ metadata:
2626
labels:
2727
{{- with .Values.extraLabels -}}
2828
{{ toYaml . | nindent 4 }}
29-
{{- end }}
29+
{{- end }}
3030
spec:
3131
version: {{ .Values.elasticsearch.version }}
3232
{{- if .Values.elasticsearch.image }}
@@ -35,7 +35,7 @@ spec:
3535
http:
3636
tls:
3737
{{- if .Values.elasticsearch.tlsEnabled }}
38-
certificate:
38+
certificate:
3939
secretName: {{ tpl .Values.elasticsearch.certificateSecretName . }}
4040
selfSignedCertificate:
4141
{{- if .Values.elasticsearch.subjectAltNames }}
@@ -88,9 +88,9 @@ spec:
8888
{{- if not .Values.elasticsearch.defaultNodeSet.memoryMapping }}
8989
node.store.allow_mmap: false
9090
{{- end }}
91-
podTemplate:
91+
podTemplate:
9292
metadata:
93-
labels:
93+
labels:
9494
{{- with .Values.extraLabels -}}
9595
{{ toYaml . | nindent 12 }}
9696
{{- end }}
@@ -144,7 +144,7 @@ spec:
144144
memory: 50Mi
145145
cpu: 500m
146146
limits:
147-
memory: 100Mi
147+
memory: 100Mi
148148
{{- end }}
149149
{{- end }}
150150
{{- end }}

‎apigateway/helm/templates/ingress.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ metadata:
4343
{{- $labels | nindent 4 }}
4444
{{- with $.Values.extraLabels -}}
4545
{{ toYaml . | nindent 4 }}
46-
{{- end }}
46+
{{- end }}
4747
{{- with .annotations }}
4848
annotations:
4949
{{- toYaml . | nindent 4 }}

‎apigateway/helm/templates/job.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ spec:
205205
imagePullSecrets:
206206
{{- toYaml . | nindent 8 }}
207207
{{- end }}
208-
208+
209209
{{ end }}
210210

211211
{{- end -}}

‎apigateway/helm/templates/kibana.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
name: {{ include "common.names.fullname" . }}
7575
podTemplate:
7676
metadata:
77-
labels:
77+
labels:
7878
{{- with .Values.extraLabels -}}
7979
{{ toYaml . | nindent 8 }}
8080
{{- end }}
@@ -147,7 +147,7 @@ spec:
147147
name: {{ include "apigateway.kibanasecret" . }}
148148
key: password
149149
{{- if .Values.kibana.tls.enabled }}
150-
- name: KIBANA_TRUSTSTORE_PASSWORD
150+
- name: KIBANA_TRUSTSTORE_PASSWORD
151151
valueFrom:
152152
secretKeyRef:
153153
name: {{ include "apigateway.kibanatruststorepassword" . }}

‎apigateway/helm/templates/license.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ apiVersion: v1
2323
kind: ConfigMap
2424
metadata:
2525
name: {{ include "common.names.fullname" . }}-license
26-
labels:
26+
labels:
2727
{{- include "common.labels.standard" . | nindent 4 }}
2828
{{- with .Values.extraLabels -}}
2929
{{ toYaml . | nindent 4 }}
30-
{{- end }}
30+
{{- end }}
3131
annotations:
32-
helm.sh/resource-policy: keep
32+
helm.sh/resource-policy: keep
3333
data:
3434
licensekey:
3535
{{ .Values.license | toYaml | nindent 4 }}

‎apigateway/helm/templates/nginx-configmap.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,41 @@ data:
3434
worker_processes 1;
3535
error_log /var/log/nginx/error.log debug;
3636
pid /var/run/nginx.pid;
37-
37+
3838
events {
3939
worker_connections 1024;
4040
}
41-
41+
4242
http {
4343
include /etc/nginx/mime.types;
4444
default_type application/octet-stream;
45-
45+
4646
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
4747
'$status $body_bytes_sent "$http_referer" '
4848
'"$http_user_agent" "$http_x_forwarded_for"';
49-
49+
5050
access_log /var/log/nginx/access.log main;
51-
51+
5252
sendfile on;
5353
#tcp_nopush on;
5454
keepalive_timeout 65;
5555
gzip on;
56-
56+
5757
upstream apigateway-rt {
5858
server {{ include "common.names.fullname" . }}-rt:{{ int .Values.apigw.runtimePort }};
5959
}
60-
60+
6161
upstream apigateway-ui {
6262
server {{ include "common.names.fullname" . }}-ui:{{ int .Values.apigw.uiPort }};
6363
}
64-
64+
6565
server {
6666
listen {{ int .Values.apigw.runtimePort }};
6767
location / {
6868
proxy_pass http://apigateway-rt;
6969
}
7070
}
71-
71+
7272
server {
7373
listen {{ int .Values.apigw.uiPort }};
7474
location / {

0 commit comments

Comments
 (0)