Skip to content

Commit bbbbbd1

Browse files
committed
yaml: Use consistent comment styling.
This follows Zulip's current convention for sysadmin-facing template files that prose are prefixed by ##, while code to be uncommented is prefixed by a single #.
1 parent 14b1f0b commit bbbbbd1

File tree

3 files changed

+99
-89
lines changed

3 files changed

+99
-89
lines changed

kubernetes/chart/zulip/Chart.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ description: Zulip is an open source threaded team chat that helps teams stay pr
33
name: zulip
44
type: application
55
icon: https://raw.githubusercontent.com/zulip/zulip/main/static/images/logo/zulip-icon-square.svg
6-
# This is the chart version. This version number should be incremented each time you make changes
7-
# to the chart and its templates, including the app version.
8-
# Versions are expected to follow Semantic Versioning (https://semver.org/)
6+
## This is the chart version. This version number should be
7+
## incremented each time you make changes to the chart and its
8+
## templates, including the app version. Versions are expected to
9+
## follow Semantic Versioning (https://semver.org/)
910
version: 0.9.20
1011

11-
# This is the version number of the application being deployed. This version number should be
12-
# incremented each time you make changes to the application. Versions are not expected to
13-
# follow Semantic Versioning. They should reflect the version the application is using.
14-
# It is recommended to use it with quotes.
12+
## This is the version number of the application being deployed. This
13+
## version number should be incremented each time you make changes to
14+
## the application. Versions are not expected to follow Semantic
15+
## Versioning. They should reflect the version the application is
16+
## using. It is recommended to use it with quotes.
1517
appVersion: "9.2-0"
1618
dependencies:
1719
- name: memcached
@@ -33,7 +35,7 @@ dependencies:
3335
repository: oci://registry-1.docker.io/bitnamicharts
3436
tags:
3537
- postgresql
36-
# Note: values.yaml overwrites posgresql image to zulip/zulip-postgresql:14
38+
## Note: values.yaml overwrites posgresql image to zulip/zulip-postgresql:14
3739
version: 15.5.32
3840

3941
sources:

kubernetes/chart/zulip/values.yaml

Lines changed: 84 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
1-
# Default values for zulip.
2-
# This is a YAML-formatted file.
3-
# Declare variables to be passed into your templates.
4-
# If you make any changes to the documentation here, regenerate the README.md
5-
# with:
6-
#
7-
# ```
8-
# docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:latest
9-
# ```
1+
## Default values for zulip.
2+
## This is a YAML-formatted file.
3+
##
4+
## Declare variables to be passed into your templates.
5+
## If you make any changes to the documentation here, regenerate the README.md
6+
## with:
7+
##
8+
## ```
9+
## docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:latest
10+
## ```
1011

1112
image:
12-
# -- Defaults to hub.docker.com/zulip/docker-zulip, but can be overwritten with a full HTTPS address.
13+
## Defaults to https://hub.docker.com/zulip/docker-zulip, but can be
14+
## overwritten with a full HTTPS address.
1315
repository: zulip/docker-zulip
14-
# -- Pull policy for Zulip docker image.
15-
# Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
16+
## Pull policy for Zulip docker image.
17+
## Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
1618
pullPolicy: IfNotPresent
17-
# -- Zulip image tag (immutable tags are recommended)
19+
## Zulip image tag (immutable tags are recommended)
1820
tag: "9.2-0"
1921

20-
# -- Global Docker registry secret names as an array.
22+
## Global Docker registry secret names as an array.
2123
imagePullSecrets: []
2224

23-
# -- Partially override common.names.fullname template (will maintain the release name).
25+
## Partially override common.names.fullname template (will maintain the release name).
2426
nameOverride: ""
2527

26-
# -- Fully override common.names.fullname template.
28+
## Fully override common.names.fullname template.
2729
fullnameOverride: ""
2830

2931
serviceAccount:
30-
# -- Specifies whether a service account should be created.
32+
## Specifies whether a service account should be created.
3133
create: true
32-
# -- Annotations to add to the service account.
34+
## Annotations to add to the service account.
3335
annotations: {}
34-
# -- The name of the service account to use.
35-
# If not set and create is true, a name is generated using the fullname template
36+
## The name of the service account to use.
37+
## If not set and create is true, a name is generated using the fullname template
3638
name: ""
3739

38-
# -- Custom labels to add to the Zulip StatefulSet.
40+
## Custom labels to add to the Zulip StatefulSet.
3941
statefulSetLabels: {}
40-
# -- Custom annotations to add to the Zulip StatefulSet.
42+
## Custom annotations to add to the Zulip StatefulSet.
4143
statefulSetAnnotations: {}
4244

43-
# -- Custom labels to add to the Zulip Pod.
45+
## Custom labels to add to the Zulip Pod.
4446
podLabels: {}
45-
# -- Custom annotations to add to the Zulip Pod.
47+
## Custom annotations to add to the Zulip Pod.
4648
podAnnotations: {}
4749

48-
# -- Can be used to override the default PodSecurityContext (fsGroup, runAsUser
49-
# and runAsGroup) of the Zulip _Pod_.
50+
## Can be used to override the default PodSecurityContext (fsGroup,
51+
## runAsUser and runAsGroup) of the Zulip _Pod_.
5052
podSecurityContext:
5153
{}
5254
# fsGroup: 1000
5355
# runAsUser: 1000
5456
# runAsGroup: 1000
5557

56-
# -- Can be used to override the default SecurityContext of the Zulip _container_.
58+
## Can be used to override the default SecurityContext of the Zulip _container_.
5759
securityContext:
5860
{}
5961
# capabilities:
@@ -63,74 +65,78 @@ securityContext:
6365
# runAsNonRoot: true
6466
# runAsUser: 1000
6567

66-
# -- Service type and port for the Kubernetes service that connects to Zulip.
67-
# Default: ClusterIP, needs an Ingress to be used.
68+
## Service type and port for the Kubernetes service that connects to
69+
## Zulip. Default of ClusterIP needs an Ingress to be used.
6870
service:
6971
type: ClusterIP
7072
port: 80
7173

7274
ingress:
73-
# -- Enable this to use an Ingress to reach the Zulip service.
75+
## Enable this to use an Ingress to reach the Zulip service.
7476
enabled: false
75-
# -- Can be used to add custom Ingress annotations.
77+
## Can be used to add custom Ingress annotations.
7678
annotations:
7779
{}
7880
# kubernetes.io/ingress.class: nginx
7981
# kubernetes.io/tls-acme: "true"
8082
hosts:
81-
# -- Host for the Ingress. Should be the same as
82-
# `zulip.environment.SETTING_EXTERNAL_HOST`.
83+
## Host for the Ingress. Should be the same as
84+
## `zulip.environment.SETTING_EXTERNAL_HOST`.
8385
- host: zulip.example.com
84-
# -- Serves Zulip root of the chosen host domain.
86+
## Serves Zulip root of the chosen host domain.
8587
paths:
8688
- path: /
87-
# -- Set a specific secret to read the TLS certificate from. If you use
88-
# cert-manager, it will save the TLS secret here. If you do not, you need to
89-
# manually create a secret with your TLS certificate.
89+
## Set a specific secret to read the TLS certificate from. If you
90+
## use cert-manager, it will save the TLS secret here. If you do
91+
## not, you need to manually create a secret with your TLS
92+
## certificate.
9093
tls: []
9194
# - secretName: chart-example-tls
9295
# hosts:
9396
# - zulip.example.com
9497

9598
resources:
9699
{}
97-
# We usually recommend not to specify default resources and to leave this as a conscious
98-
# choice for the user. This also increases chances charts run on environments with little
99-
# resources, such as Minikube. If you do want to specify resources, uncomment the following
100-
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
100+
## We usually recommend not to specify default resources and to
101+
## leave this as a conscious choice for the user. This also
102+
## increases chances charts run on environments with little
103+
## resources, such as Minikube. If you do want to specify resources,
104+
## uncomment the following lines, adjust them as necessary, and
105+
## remove the curly braces after 'resources:'.
101106
# limits:
102107
# cpu: 100m
103108
# memory: 128Mi
104109
# requests:
105110
# cpu: 100m
106111
# memory: 128Mi
107112

108-
# -- Optionally add a nodeSelector to the Zulip pod, so it runs on a specific
109-
# node.
110-
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
113+
## Optionally add a nodeSelector to the Zulip pod, so it runs on a specific
114+
## node.
115+
## Ref: https://kubernetes.io/docs/user-guide/node-selection/
111116
nodeSelector: {}
112117

113-
# -- Tolerations for pod assignment.
114-
# Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
118+
## Tolerations for pod assignment.
119+
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
115120
tolerations: []
116121

117-
# -- Affinity for pod assignment.
118-
# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
122+
## Affinity for pod assignment.
123+
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
119124
affinity: {}
120125

121126
zulip:
122-
# Environment variables based on https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63
127+
## Environment variables based on
128+
## https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63
123129
environment:
124-
# -- Disables HTTPS if set to "true".
125-
# HTTPS and certificates are managed by the Kubernetes cluster, so
126-
# by default it's disabled inside the container
130+
## Disable the default Zulip requirement of HTTPS. HTTPS and
131+
## certificates are managed by the Kubernetes cluster, so by
132+
## default it's disabled inside the container.
127133
DISABLE_HTTPS: true
128-
# -- Set SSL certificate generation to self-signed because Kubernetes
129-
# manages the client-facing SSL certs.
134+
## Set SSL certificate generation to self-signed because
135+
## Kubernetes manages the client-facing SSL certs.
130136
SSL_CERTIFICATE_GENERATION: self-signed
131-
# -- Domain Zulip is hosted on.
137+
## Domain Zulip is hosted on.
132138
SETTING_EXTERNAL_HOST: zulip.example.com
133-
# -- SMTP email password.
139+
## SMTP email password.
134140
SECRETS_email_password: "123456789"
135141
SETTING_ZULIP_ADMINISTRATOR: "[email protected]"
136142
SETTING_EMAIL_HOST: "" # e.g. smtp.example.com
@@ -139,27 +145,28 @@ zulip:
139145
SETTING_EMAIL_USE_SSL: "False"
140146
SETTING_EMAIL_USE_TLS: "True"
141147
ZULIP_AUTH_BACKENDS: "EmailAuthBackend"
142-
# -- If `persistence.existingClaim` is not set, a PVC is generated with these
143-
# specifications.
148+
## If `persistence.existingClaim` is not set, a PVC (Persistent
149+
## Volume Claim) is generated with these specifications.
144150
persistence:
145151
enabled: true
146152
accessMode: ReadWriteOnce
147153
size: 10Gi
148-
# -- Set storageClass to use.
154+
## Set storageClass to use.
149155
storageClass:
150-
# existingClaim: "" # Use an already existing PVC
156+
## Use an already existing PVC
157+
# existingClaim: ""
151158

152-
# -- Liveness probe values.
153-
# Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
159+
## Liveness probe values.
160+
## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
154161
livenessProbe:
155162
enabled: true
156163
initialDelaySeconds: 10
157164
periodSeconds: 10
158165
timeoutSeconds: 5
159166
failureThreshold: 3
160167
successThreshold: 1
161-
# -- Startup probe values.
162-
# Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
168+
## Startup probe values.
169+
## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
163170
startupProbe:
164171
enabled: true
165172
initialDelaySeconds: 10
@@ -169,18 +176,18 @@ startupProbe:
169176
successThreshold: 1
170177

171178
postSetup:
172-
# -- The Docker entrypoint script runs commands from `/data/post-setup.d` after
173-
# the Zulip application's Setup phase has completed. Scripts can be added here
174-
# as `script_filename: <script contents>` and they will be mounted in
175-
# `/data/post-setup.d/script_filename`.
179+
## The Docker entrypoint script runs commands from `/data/post-setup.d` after
180+
## the Zulip application's Setup phase has completed. Scripts can be added here
181+
## as `script_filename: <script contents>` and they will be mounted in
182+
## `/data/post-setup.d/script_filename`.
176183
scripts:
177184
{}
178185
# scriptName.sh: |
179186
# #!/bin/bash
180-
# echo "This is a script that gets executed in the Zulip container after installation, once migrations are complete"
187+
# echo "This script is executed in the Zulip container after installation/migrations."
181188

182-
# -- You can add any sidecar to Zulip, like a minio client to use for
183-
# uploading backups to a bucket, and mounting the volume for Zulip.
189+
## You can add any sidecar to Zulip, like a minio client to use for
190+
## uploading backups to a bucket, and mounting the volume for Zulip.
184191
# sidecars:
185192
# - image: minio/mc
186193
# name: minio-client
@@ -190,32 +197,32 @@ postSetup:
190197
sidecars:
191198
[]
192199

193-
# -- PostgreSQL settings, see [Requirements](#Requirements).
200+
## PostgreSQL settings, see [Requirements](#Requirements).
194201
postgresql:
195202
primary:
196203
containerSecurityContext:
197204
runAsUser: 0
198-
# We need to override the Postgresql image to get all the plugins Zulip needs
205+
## We need to override the Postgresql image to get all the plugins Zulip needs
199206
image:
200207
repository: zulip/zulip-postgresql
201208
tag: 14
202209
auth:
203210
username: zulip
204211
database: zulip
205212

206-
# -- Rabbitmq settings, see [Requirements](#Requirements).
213+
## Rabbitmq settings, see [Requirements](#Requirements).
207214
rabbitmq:
208215
auth:
209216
username: zulip
210-
# Set this to true if you need the rabbitmq to be persistent
217+
## Set this to true if you need the rabbitmq to be persistent
211218
persistence:
212219
enabled: false
213220

214-
# -- Memcached settings, see [Requirements](#Requirements).
221+
## Memcached settings, see [Requirements](#Requirements).
215222
memcached:
216223
memcachedUsername: "zulip@localhost"
217224

218-
# -- Redis settings, see [Requirements](#Requirements).
225+
## Redis settings, see [Requirements](#Requirements).
219226
redis:
220227
architecture: standalone
221228
master:

kubernetes/manual/zulip-rc.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ spec:
9292
cpu: 100m
9393
memory: 3584Mi
9494
env:
95-
# Please take a look at the environment variables in docker-compose.yml for all required env variables!
95+
## Please take a look at the environment variables in
96+
## docker-compose.yml for all required env variables!
9697
- name: DB_HOST
9798
value: "localhost"
9899
- name: MEMCACHED_HOST
@@ -110,7 +111,7 @@ spec:
110111
- name: SETTING_ZULIP_ADMINISTRATOR
111112
112113
- name: SETTING_EMAIL_HOST
113-
value: "" # E.g. 'smtp.example.com'
114+
value: ""
114115
- name: SETTING_EMAIL_HOST_USER
115116
116117
- name: ZULIP_USER_EMAIL
@@ -121,7 +122,7 @@ spec:
121122
value: "123456789"
122123
- name: SECRETS_secret_key
123124
value: "REPLCAE_WITH_SECURE_SECRET_KEY"
124-
# These should match the passwords configured above
125+
## These should match the passwords configured above
125126
- name: SECRETS_postgres_password
126127
value: "REPLACE_WITH_SECURE_POSTGRES_PASSWORD"
127128
- name: SECRETS_memcached_password
@@ -132,7 +133,7 @@ spec:
132133
value: "REPLACE_WITH_SECURE_REDIS_PASSWORD"
133134
- name: SSL_CERTIFICATE_GENERATION
134135
value: "self-signed"
135-
# Uncomment this when configuring the mobile push notifications service
136+
## Uncomment this when configuring the mobile push notifications service
136137
# - name: SETTING_PUSH_NOTIFICATION_BOUNCER_URL
137138
# value: 'https://push.zulipchat.com'
138139
ports:

0 commit comments

Comments
 (0)