From 8ed0fa9a5a929affd1da9d859d72826e9cf2c6a4 Mon Sep 17 00:00:00 2001
From: Dimitris Moraitis <dimo@mist.io>
Date: Fri, 26 Jul 2019 10:50:47 +0000
Subject: [PATCH 1/2] Revert "Fix k8s ingress tls annotations"

This reverts commit 1a1e98b77efefaa693cbe6d2709fcf1520f15a0c
---
 CHANGELOG.md                      | 1 -
 chart/mist/templates/ingress.yaml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e92b688..22e8f3ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@
 * Bugfix: Fix volume actions & attachment info update in UI
 * Bugfix: Fix volume parsing in DigitalOcean and OpenStack
 * Bugfix: Fix detach_volume in OpenStack driver
-* Bugfix: Dont throw exception when landing content page is unreachable
 
 ## v4.1.0 (21 May 2019)
 
diff --git a/chart/mist/templates/ingress.yaml b/chart/mist/templates/ingress.yaml
index 0c08b8ca..51a46040 100644
--- a/chart/mist/templates/ingress.yaml
+++ b/chart/mist/templates/ingress.yaml
@@ -8,8 +8,8 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    kubernetes.io/ingress.class: nginx
 {{- if .Values.http.tlsSecret }}
-    ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     {{- if .Values.http.http2 }}
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
@@ -39,4 +39,3 @@ spec:
       - backend:
           serviceName: {{ include "chart.fullname" . }}-nginx
           servicePort: 80
-        path: /*

From bf0c97b92add309017982fa9e561877f2b1dd018 Mon Sep 17 00:00:00 2001
From: Dimitris Moraitis <dimo@mist.io>
Date: Fri, 26 Jul 2019 18:46:21 +0300
Subject: [PATCH 2/2] Update api, landing & ui submodule

---
 api     | 2 +-
 landing | 2 +-
 ui      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api b/api
index e03a6df3..8bf3a20e 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit e03a6df3cfda6d0270c1c8fa1a17e313a5910a10
+Subproject commit 8bf3a20ea77dc6f51c5a13bde12c4772db12712a
diff --git a/landing b/landing
index c84fda7b..6781a717 160000
--- a/landing
+++ b/landing
@@ -1 +1 @@
-Subproject commit c84fda7b59b49bd97de27d1871adf1ff26a5b631
+Subproject commit 6781a71745435c3062170c0290907fe850bc6195
diff --git a/ui b/ui
index f1db05a0..682d36cb 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit f1db05a07842978ded3a78f10134e1c7056f2536
+Subproject commit 682d36cb619e9b835dd8da86bef9cadd1fc168ee