From 8a2674303f6d02a9e22004dae0bf1f00c85919fb Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Tue, 29 Jan 2019 11:10:48 +0200
Subject: [PATCH] Add ingress config option to kontena-lens addon (#995)

---
 non-oss/pharos_pro/addons/kontena-lens/addon.rb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/non-oss/pharos_pro/addons/kontena-lens/addon.rb b/non-oss/pharos_pro/addons/kontena-lens/addon.rb
index a31168e2d..18398ebce 100644
--- a/non-oss/pharos_pro/addons/kontena-lens/addon.rb
+++ b/non-oss/pharos_pro/addons/kontena-lens/addon.rb
@@ -10,6 +10,13 @@
 
   config_schema {
     optional(:name).filled(:str?)
+    optional(:ingress).schema do
+      optional(:host).filled(:str?)
+      optional(:tls).schema do
+        optional(:enabled).filled(:bool?)
+        optional(:email).filled(:str?)
+      end
+    end
     optional(:host).filled(:str?)
     optional(:tls).schema do
       optional(:enabled).filled(:bool?)
@@ -45,14 +52,15 @@
   install {
     patch_old_resource
 
-    host = config.host || "lens.#{gateway_node_ip}.nip.io"
+    host = config.ingress&.host || config.host || "lens.#{gateway_node_ip}.nip.io"
+    tls_email = config.ingress&.tls&.email || config.tls&.email
     name = config.name || 'pharos-cluster'
     charts_enabled = config.charts&.enabled != false
     helm_repositories = config.charts&.repositories || [stable_helm_repo]
     tiller_version = '2.12.2'
     apply_resources(
       host: host,
-      email: config.tls&.email,
+      email: tls_email,
       tls_enabled: tls_enabled?,
       charts_enabled: charts_enabled,
       user_management: user_management_enabled?,
@@ -71,6 +79,8 @@
       create_admin_user(admin_password)
       message << "\nYou can sign in with the following admin credentials (you won't see these again): " + pastel.cyan("admin / #{admin_password}")
     end
+    message << "\nWarning: `config.host` option is deprecated in favor of `config.ingress.host` option and will be removed in future." if config.host
+    message << "\nWarning: `config.tls` option is deprecated in favor of `config.ingress.tls` option and will be removed in future." if config.tls
     post_install_message(message)
   }
 
@@ -154,7 +164,7 @@ def gateway_node_ip
   end
 
   def tls_enabled?
-    config.tls&.enabled != false
+    config.ingress&.tls&.enabled != false && config.tls&.enabled != false
   end
 
   def user_management_enabled?