From 8bf259333d14d3c1264972799d668e683ce21bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?=
 <felix-antoine.fortin@calculquebec.ca>
Date: Fri, 20 Sep 2024 09:13:07 -0400
Subject: [PATCH] Bump magic castle version to 14.0.0-beta.2

---
 .github/workflows/workflow.yml      | 2 +-
 Dockerfile                          | 6 +++---
 mchub/configuration/magic_castle.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 4b9f22fa..6583dd17 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -12,7 +12,7 @@ on:
 env:
   IMAGE_NAME: "cmdntrf/mc-hub"
   RUN_LIVE_CLUSTER_TESTS: ${{ (github.event.inputs.force_build_live_cluster == 'yes' || startsWith(github.ref, 'refs/tags/v')) && 'true' || 'false' }}
-  MAGIC_CASTLE_VERSION: 12.6.8
+  MAGIC_CASTLE_VERSION: 14.0.0-beta.2
 
 jobs:
   frontend:
diff --git a/Dockerfile b/Dockerfile
index cf071b51..358af4a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,13 +16,13 @@ RUN apt-get update && \
     pip install poetry
 
 ENV MAGIC_CASTLE_PATH=/magic_castle
-ENV MAGIC_CASTLE_VERSION=12.6.8
+ENV MAGIC_CASTLE_VERSION=14.0.0-beta.2
 RUN curl -L https://github.com/ComputeCanada/magic_castle/releases/download/${MAGIC_CASTLE_VERSION}/magic_castle-openstack-${MAGIC_CASTLE_VERSION}.tar.gz -o magic_castle.tar.gz && \
     tar xvf magic_castle.tar.gz && \
     mv magic_castle-* ${MAGIC_CASTLE_PATH} && \
     chown -R root:root ${MAGIC_CASTLE_PATH}
 
-ENV TERRAFORM_VERSION 1.3.9
+ENV TERRAFORM_VERSION 1.5.7
 RUN TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_$(dpkg --print-architecture).zip" && \
     curl -L ${TERRAFORM_URL} -o terraform.zip && \
     unzip terraform.zip -d /usr/local/bin
@@ -70,7 +70,7 @@ RUN mkdir -p /home/mcu/clusters /home/mcu/database /home/mcu/credentials /home/m
 ADD .terraformrc /home/mcu
 
 ENV MAGIC_CASTLE_PATH=/magic_castle
-ENV MAGIC_CASTLE_VERSION=12.6.8
+ENV MAGIC_CASTLE_VERSION=14.0.0-beta.2
 ENV MCH_DIST_PATH=/code/frontend
 
 CMD python3 -m mchub.schema_update --clean && \
diff --git a/mchub/configuration/magic_castle.py b/mchub/configuration/magic_castle.py
index 4f4dafa0..264b4811 100644
--- a/mchub/configuration/magic_castle.py
+++ b/mchub/configuration/magic_castle.py
@@ -11,7 +11,7 @@
 )
 TERRAFORM_REQUIRED_VERSION = ">= 1.2.1"
 
-MAGIC_CASTLE_VERSION = environ.get("MAGIC_CASTLE_VERSION", "12.6.8")
+MAGIC_CASTLE_VERSION = environ.get("MAGIC_CASTLE_VERSION", "14.0.0-beta.2")
 MAGIC_CASTLE_PATH = environ.get("MAGIC_CASTLE_PATH", "git")
 if MAGIC_CASTLE_PATH == "git":
     MAGIC_CASTLE_SOURCE = {