From a7672eb210dce0534d45445c5715f62b883e0c98 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 8 Feb 2022 16:44:53 +0100
Subject: [PATCH] remove the need for running a fork, use newest version built
 from newest commit from `main` (`5e90b32f40`)

---
 flux2/apps/zulip/zulip-values-configmap.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/flux2/apps/zulip/zulip-values-configmap.yaml b/flux2/apps/zulip/zulip-values-configmap.yaml
index bcaa30944..ac7d86bd7 100644
--- a/flux2/apps/zulip/zulip-values-configmap.yaml
+++ b/flux2/apps/zulip/zulip-values-configmap.yaml
@@ -7,9 +7,10 @@ metadata:
 data:
   values.yaml: |
     image:
+      # Overrides the image to a version on Zulip's `main` branch because the
+      # most recent stable version (4.9) does not support OIDC (we need 5)
       repository: open.greenhost.net:4567/stackspin/stackspin/zulip
-      # Overrides the image tag whose default is the chart appVersion.
-      tag: "45062f8be0"
+      tag: "5e90b32f40"
 
     ingress:
       enabled: true
@@ -115,5 +116,8 @@ data:
         create-realm.sh: |
           #!/bin/bash
           #
-          # Creates a realm with the admin email and username
+          # Download create_realm.py from PR #20075
+          su zulip -c 'curl https://raw.githubusercontent.com/zulip/zulip/6b4b71ad04af551da6bea84127e0cd99cad434be/zerver/management/commands/create_realm.py -o /home/zulip/deployments/current/zerver/management/commands/create_realm.py'
+
+          # Use create_realm.py to create 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'
-- 
GitLab