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
inviqa · Apr 22, 2020 · b1c7202 · b1c7202
1 parent 6cd2462
commit b1c7202
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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')