From 2b7b633755421469df08733d8958e98c885b4725 Mon Sep 17 00:00:00 2001
From: jarred wilson <20207921+jardon@users.noreply.github.com>
Date: Thu, 24 Feb 2022 08:41:57 -0800
Subject: [PATCH] Pin markupsafe==2.0.1 for Jinja bug workaround (#61)

* Pin markupsafe==2.0.1 for Jinja bug workaround
* Pin microk8s version to fix integration tests
---
 .github/workflows/integration.yaml  | 2 +-
 charms/istio-pilot/requirements.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 1f35065b..0b02415a 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -27,7 +27,7 @@ jobs:
 
     - uses: balchua/microk8s-actions@v0.2.2
       with:
-        channel: 'latest/stable'
+        channel: '1.21/stable'
         addons: '["dns", "storage", "rbac", "metallb:10.64.140.43-10.64.140.49"]'
 
     - name: Install dependencies
diff --git a/charms/istio-pilot/requirements.txt b/charms/istio-pilot/requirements.txt
index df61066a..74d45a72 100644
--- a/charms/istio-pilot/requirements.txt
+++ b/charms/istio-pilot/requirements.txt
@@ -1,4 +1,5 @@
 ops==1.3.0
 oci-image==1.0.0
+markupsafe==2.0.1
 jinja2==2.11.3
 serialized-data-interface<0.4