From b1c7202ff364a93be81c26f7ca6a81b4a4498e71 Mon Sep 17 00:00:00 2001
From: Andy Thompson <athompson@inviqa.com>
Date: Wed, 22 Apr 2020 14:45:30 +0100
Subject: [PATCH] Fix issue with using null when none expected of
 app.ingress.type

This will mean local traefik will not be linked anymore when "none" used, matching behaviour of helm
---
 _twig/docker-compose.yml/application.yml.twig | 4 ++--
 harness/attributes/common.yml                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_twig/docker-compose.yml/application.yml.twig b/_twig/docker-compose.yml/application.yml.twig
index f7705c5..60a7e63 100644
--- a/_twig/docker-compose.yml/application.yml.twig
+++ b/_twig/docker-compose.yml/application.yml.twig
@@ -8,7 +8,7 @@
         GITHUB_TOKEN: {{ @('github.oauth_token') }}
 {% endif %}
     labels:
-{% if @('app.ingress.type') is null %}
+{% if @('app.ingress.type') == "none" %}
       - traefik.enable=false
 {% else %}
       - traefik.backend={{ @('workspace.name') }}
@@ -23,7 +23,7 @@
       private:
         aliases:
           - {{ @('hostname') }}
-{% if @('app.ingress.type') is not null %}
+{% if @('app.ingress.type') != "none" %}
       shared: {}
 {% endif %}
     expose:
diff --git a/harness/attributes/common.yml b/harness/attributes/common.yml
index b177f3a..2460d43 100644
--- a/harness/attributes/common.yml
+++ b/harness/attributes/common.yml
@@ -9,7 +9,7 @@ attributes.default:
       name: http
       port: 80
     ingress:
-      # possible ingress types are standard, istio, or ~ for none
+      # possible ingress types are standard, istio, or none
       # note istio requires a cluster that has istio configured as the ingress controller
       type: standard
       protocol: = @('app.default_port.protocol')