Add temporary CANARY env vars to be set in...

Add temporary CANARY env vars to be set in Kubernetes-with-canary.gitlab-ci.yml and used in page_layout_helper.rb

Conflicts:
	app/helpers/page_layout_helper.rb

app/helpers/page_layout_helper.rb

@@ -39,7 +39,10 @@ module PageLayoutHelper
   end
 
   def favicon
-    Rails.env.development? ? 'favicon-green.ico' : 'favicon.ico'
+    return 'favicon-yellow.ico' if ENV['CANARY'] == 'true'
+    return 'favicon-green.ico' if Rails.env.development?
+
+    'favicon.ico'
   end
 
   def page_image

vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml

@@ -28,7 +28,7 @@ build:
 canary:
   stage: canary
   script:
-    - command canary
+    - CANARY=true command canary
   environment:
     name: production
     url: http://$CI_PROJECT_PATH_SLUG.$KUBE_DOMAIN