Skip to content

Commit 002c080

Browse files
authored
Merge pull request #217 from cognifloyd/trailing-spaces
reformat: drop trailing spaces
2 parents b2d31f3 + 4c5f944 commit 002c080

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ kubectl logs -l release=<release-name>,tier=backend
229229
## Extending this chart
230230
If you have any suggestions or ideas about how to extend this chart functionality,
231231
we welcome you to collaborate in [Issues](https://github.com/stackstorm/stackstorm-ha/issues)
232-
and contribute via [Pull Requests](https://github.com/stackstorm/stackstorm-ha/pulls).
232+
and contribute via [Pull Requests](https://github.com/stackstorm/stackstorm-ha/pulls).
233233
However if you need something very custom and specific to your infra that doesn't fit official chart plans,
234234
we strongly recommend you to create a parent Helm chart with custom K8s objects and referencing `stackstorm-ha` chart
235235
as a child dependency.

templates/_helpers.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Create the name of the stackstorm-ha service account to use
7070
{{- end -}}
7171
{{- end -}}
7272
{{- end -}}
73-
73+
7474
# Reduce duplication of the st2.*.conf volume details
7575
{{- define "st2-config-volume-mounts" -}}
7676
- name: st2-config-vol
@@ -96,7 +96,7 @@ Create the name of the stackstorm-ha service account to use
9696
- '-c'
9797
- >
9898
until nc -z -w 2 {{ $.Release.Name }}-mongodb-headless {{ $mongodb_port }} && echo mongodb ok;
99-
do
99+
do
100100
echo 'Waiting for MongoDB Connection...'
101101
sleep 2;
102102
done

templates/configmaps_st2-conf.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,10 @@ data:
4646
{{- if .Values.st2.rbac.enabled }}
4747
[rbac]
4848
enable = True
49-
backend = default
49+
backend = default
5050
{{- end }}
5151
5252
# User-defined st2 config with custom settings applied on top of everything else.
5353
# The order of merging: st2.conf < st2.docker.conf < st2.user.conf
5454
st2.user.conf: |
5555
{{ .Values.st2.config | indent 4 }}
56-

templates/deployments.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@ spec:
12621262
mountPath: /opt/stackstorm/rbac/assignments/
12631263
- name: st2-rbac-mappings-vol
12641264
mountPath: /opt/stackstorm/rbac/mappings/
1265-
{{- end }}
1265+
{{- end }}
12661266
- name: st2-pack-configs-vol
12671267
mountPath: /opt/stackstorm/configs/
12681268
- name: st2client-config-vol

templates/secrets_rabbitmq.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This configuration is a workaround to https://github.com/bitnami/charts/issues/4635
2-
# This code block should be dropped once the above issue is resolved and definitions can be defined as shown in
2+
# This code block should be dropped once the above issue is resolved and definitions can be defined as shown in
33
# https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq#load-definitions
44
---
55
apiVersion: v1

templates/secrets_st2chatops.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Secret
55
metadata:
66
name: {{ .Release.Name }}-st2chatops
7-
annotations:
7+
annotations:
88
description: Custom StackStorm chatops config, passed to hubot as ENV vars
99
labels:
1010
app: st2chatops

values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
image:
88
# Image pull policy
99
pullPolicy: IfNotPresent
10-
# st2 image repository. Set this to override the default ("stackstorm")
10+
# st2 image repository. Set this to override the default ("stackstorm")
1111
# docker image repository ("docker.stackstorm.com"). Applies to all st2 containers except
12-
# st2chatops and st2packs (which have their own override). This also does not impact
12+
# st2chatops and st2packs (which have their own override). This also does not impact
1313
# dependencies such as mongo or redis, which have their own helm chart settings.
1414
repository: ""
1515
# st2 image tag - defaults to AppVersion.
@@ -580,7 +580,7 @@ rabbitmq:
580580
enabled: true
581581
# Enable Queue Mirroring between nodes
582582
# See https://www.rabbitmq.com/ha.html
583-
# This code block is commented out waiting for
583+
# This code block is commented out waiting for
584584
# https://github.com/bitnami/charts/issues/4635
585585
loadDefinition:
586586
enabled: true
@@ -612,7 +612,7 @@ redis:
612612
cluster:
613613
slaveCount: 3
614614
# Sentinel settings. Sentinel is enabled for better resiliency.
615-
# This is highly recommended as per tooz library documentation.
615+
# This is highly recommended as per tooz library documentation.
616616
# Hence, the chart requires the setting.
617617
# https://docs.openstack.org/tooz/latest/user/drivers.html#redis
618618
# https://github.com/bitnami/charts/tree/master/bitnami/redis#master-slave-with-sentinel

0 commit comments

Comments
 (0)