Skip to content

Commit 0be0065

Browse files
committed
fix: wpb-23988 sync wire-server helm chart secrets for wiab-dev from prod values for 5.25
1 parent af08fab commit 0be0065

File tree

2 files changed

+43
-25
lines changed

2 files changed

+43
-25
lines changed

values/wire-server/demo-secrets.example.yaml

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,82 @@
1-
# CHANGEME-DEMO: All values here should be changed/reviewed
1+
# CHANGEME-DEV: All values here should be changed/reviewed
2+
# check the ansible playbook ansible/wiab-demo/wire_secrets.yml on how these secrets are being randomly generated and rotated
3+
# make sure that any secrets related to external services like AWS, giphy, youtube, spotify etc are being updated before running the random secret generation (ansible/wiab-demo/wire_secrets.yml) at demo-secrets.example.yaml and before deploying the helm charts using the playbook (ansible/wiab-demo/helm_install.yml)
4+
5+
# The secrets for services like elasticsearch, postgresql, rabbitmq and AWS (fake) secretID and key are configured in their helm charts. The values passed to these charts can be modified at wire-server-deploy/service-name/demo-[values|secrets].example.yaml
6+
# postgresql - https://github.com/wireapp/helm-charts/tree/dev/charts/postgresql
7+
# elasticsearch - https://github.com/wireapp/wire-server/blob/develop/charts/elasticsearch-ephemeral
8+
# rabbitMQ - https://github.com/wireapp/wire-server/tree/develop/charts/rabbitmq
9+
# fake-aws - https://github.com/wireapp/wire-server/tree/develop/charts/fake-aws
10+
# AWS - this needs to be checked with wire support if needs to use real AWS services
11+
212
elasticsearch-index:
313
secrets:
414
elasticsearch:
5-
username: elastic
6-
password: changeme
15+
username: "elastic"
16+
password: "changeme"
17+
718
brig:
819
secrets:
20+
pgPassword: verysecurepassword
921
smtpPassword: dummyPassword
1022
zAuth:
1123
# generate zauth public/private keys with the 'zauth' executable from wire-server:
12-
# ./dist/zauth -m gen-keypair -i 1
24+
# sudo docker run $ZAUTH_CONTAINER -m gen-keypair
1325
publicKeys: "<public key>"
1426
privateKeys: "<private key>"
1527
turn:
1628
# generate a high-entropy random string, e.g. using
17-
# openssl rand -base64 64 | env LC_CTYPE=C tr -dc a-zA-Z0-9 | head -c 42
29+
# openssl rand -base64 64 | env LC_CTYPE=C tr -dc a-zA-Z0-9 | head -c 64
1830
secret: CHANGEMEE6KHMJU1uDhhgvsVWoIyzmn3u3GHRoWjTp
19-
# these only need to be changed if using real AWS services
2031
awsKeyId: dummykey
2132
awsSecretKey: dummysecret
22-
# These are only necessary if you wish to support sign up via SMS/calls
23-
# And require accounts at twilio.com / nexmo.com
2433
rabbitmq:
2534
username: wire-server
2635
password: verysecurepassword
27-
# PostgreSQL password is synced with the wire-postgresql-secret from k8s cluster
28-
# To extract the secret from an existing Kubernetes cluster:
29-
# kubectl get secret wire-postgresql-secret -n postgresql -o jsonpath='{.data.password}' | base64 -d
30-
pgPassword: dummyPassword # gets replaced by the actual secret
3136
elasticsearch:
3237
username: "elastic"
3338
password: "changeme"
3439
elasticsearchAdditional:
3540
username: "elastic"
3641
password: "changeme"
37-
cannon:
42+
43+
cargohold:
3844
secrets:
45+
awsKeyId: dummykey
46+
awsSecretKey: dummysecret
3947
rabbitmq:
4048
username: wire-server
4149
password: verysecurepassword
4250

43-
cargohold:
51+
cannon:
4452
secrets:
45-
# these only need to be changed if using real AWS services
46-
awsKeyId: dummykey
47-
awsSecretKey: dummysecret
4853
rabbitmq:
4954
username: wire-server
5055
password: verysecurepassword
5156

5257
galley:
5358
secrets:
54-
# these only need to be changed if using real AWS services
55-
awsKeyId: dummykey
56-
awsSecretKey: dummysecret
57-
# PostgreSQL password is synced with the wire-postgresql-secret from k8s cluster
58-
# To extract the secret from an existing Kubernetes cluster:
59-
# kubectl get secret wire-postgresql-secret -n postgresql -o jsonpath='{.data.password}' | base64 -d
60-
pgPassword: dummyPassword # gets replaced by the actual secret
6159
rabbitmq:
6260
username: wire-server
6361
password: verysecurepassword
62+
pgPassword: verysecurepassword
63+
# these only need to be changed if using real AWS services
64+
awsKeyId: dummykey
65+
awsSecretKey: dummysecret
66+
mlsPrivateKeys:
67+
removal:
68+
ed25519: |
69+
-----BEGIN PRIVATE KEY-----
70+
-----END PRIVATE KEY-----
71+
ecdsa_secp256r1_sha256: |
72+
-----BEGIN PRIVATE KEY-----
73+
-----END PRIVATE KEY-----
74+
ecdsa_secp384r1_sha384: |
75+
-----BEGIN PRIVATE KEY-----
76+
-----END PRIVATE KEY-----
77+
ecdsa_secp521r1_sha512: |
78+
-----BEGIN PRIVATE KEY-----
79+
-----END PRIVATE KEY-----
6480
6581
gundeck:
6682
secrets:
@@ -93,9 +109,11 @@ nginz:
93109
# only necessary in test environments (env="staging"). See charts/nginz/README.md
94110
basicAuth: "<username>:<htpasswd-hashed-password>"
95111

112+
96113
# RabbitMQ credentials for background-worker.
97114
background-worker:
98115
secrets:
116+
pgPassword: verysecurepassword
99117
rabbitmq:
100118
username: wire-server
101119
password: verysecurepassword

values/wire-server/demo-values.example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CHANGEME-PROD: All values here should be changed/reviewed
1+
# CHANGEME-DEV: All values here should be changed/reviewed
22
tags:
33
proxy: false # enable if you want/need giphy/youtube/etc proxying
44
legalhold: false # Enable if you need legalhold

0 commit comments

Comments
 (0)