diff --git a/flux2/apps/zulip/zulip-values-configmap.yaml b/flux2/apps/zulip/zulip-values-configmap.yaml index 2eca8c6659925be229545b570d91877a6b66f829..628cbd7fbf222e07adaadfe8e39bb10cd838357b 100644 --- a/flux2/apps/zulip/zulip-values-configmap.yaml +++ b/flux2/apps/zulip/zulip-values-configmap.yaml @@ -5,19 +5,26 @@ metadata: name: stackspin-zulip-values data: values.yaml: | + image: + repository: open.greenhost.net:4567/stackspin/stackspin/zulip + # Overrides the image tag whose default is the chart appVersion. + tag: "f60b8cc" + ingress: - hosts: - - zulip.${domain} annotations: # Tell cert-manager to automatically get a TLS certificate kubernetes.io/tls-acme: "true" + hosts: + - zulip.${domain} + paths: + - path: / tls: - hosts: - "zulip.${domain}" secretName: stackspin-zulip memcached: - password: "${memcached_password}" + memcachedPassword: "${memcached_password}" resources: limits: cpu: 200m @@ -26,8 +33,14 @@ data: cpu: 100m memory: 128Mi + rabbitmq: + auth: + password: "${rabbitmq_password}" + erlangCookie: "${rabbitmq_erlang_cookie}" + redis: - password: "${redis_password}" + auth: + password: "${redis_password}" resources: limits: cpu: 200m @@ -37,7 +50,7 @@ data: memory: 32Mi postgresql: - password: "${postgresql_password}" + postgresqlPassword: "${postgresql_password}" resources: limits: cpu: 400m @@ -47,7 +60,6 @@ data: memory: 128Mi zulip: - image: open.greenhost.net:4567/stackspin/stackspin/zulip:f60b8cc environment: DISABLE_HTTPS: true SSL_CERTIFICATE_GENERATION: self-signed @@ -76,3 +88,11 @@ data: requests: cpu: 400m memory: 1Gi + + postSetup: + scripts: + create-realm.sh: | + #!/bin/bash + # + # Creates a realm with the admin email and username + su zulip -c '/home/zulip/deployments/current/manage.py create_realm stackspin "${admin_email}" Admin --password "${admin_password}" --disable-invite-required' diff --git a/install/templates/stackspin-zulip-variables.yaml.jinja b/install/templates/stackspin-zulip-variables.yaml.jinja index 7709137f51fff7c819d1029b64e558dc5a9ad342..834de6ea859b9000ffa642c8d4eff255c5f5b30f 100644 --- a/install/templates/stackspin-zulip-variables.yaml.jinja +++ b/install/templates/stackspin-zulip-variables.yaml.jinja @@ -3,6 +3,9 @@ kind: Secret metadata: name: stackspin-zulip-variables data: + admin_password: "{{ 32 | generate_password | b64encode }}" memcached_password: "{{ 32 | generate_password | b64encode }}" + rabbitmq_password: "{{ 32 | generate_password | b64encode }}" + rabbitmq_erlang_cookie: "{{ 32 | generate_password | b64encode }}" redis_password: "{{ 32 | generate_password | b64encode }}" postgresql_password: "{{ 32 | generate_password | b64encode }}"