Merge pull request #482 from CodeForPhilly/fixes/preprod-ingress-gtm-injection

Fixes/preprod ingress gtm injection

Author: themightychris

k8s.preprod/app-ingress.yaml

@@ -13,22 +13,13 @@ metadata:
     # allow requests larger than 1MiB
     nginx.ingress.kubernetes.io/proxy-body-size: "0"
     nginx.ingress.kubernetes.io/configuration-snippet: |
-      location / {
-      sub_filter </head>
-        '<!-- Google Tag Manager -->
-        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-        })(window,document,'script','dataLayer','GTM-KBZ6ZKX');</script>
-        <!-- End Google Tag Manager -->';
-      sub_filter </body>
-        '<!-- Google Tag Manager (noscript) -->
-        <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KBZ6ZKX"
-        height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-        <!-- End Google Tag Manager (noscript) -->'
-        sub_filter_once on;
-      }
+      # Inject Google Tag Manager:
+
+      proxy_set_header Accept-Encoding ""; # upstream compression must be disabled
+
+      sub_filter '</head>' '<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({"gtm.start": new Date().getTime(),event:"gtm.js"});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!="dataLayer"?"&l="+l:"";j.async=true;j.src="https://www.googletagmanager.com/gtm.js?id="+i+dl;f.parentNode.insertBefore(j,f); })(window,document,"script","dataLayer","GTM-KBZ6ZKX");</script></head>';
+
+      sub_filter '</body>' '<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KBZ6ZKX" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript></body>';
 spec:
   tls:
   - hosts:
@@ -62,7 +53,6 @@ metadata:
       proxy_cache_bypass $http_x_purge;
       proxy_cache_key $proxy_upstream_name$request_uri;
       proxy_cache_lock on;
-      proxy_cache_use_stale updating;
       add_header X-Cache-Status $upstream_cache_status;
 spec:
   rules:

k8s.prod/app-ingress.yaml

@@ -71,7 +71,6 @@ metadata:
       proxy_cache_bypass $http_x_purge;
       proxy_cache_key $proxy_upstream_name$request_uri;
       proxy_cache_lock on;
-      proxy_cache_use_stale updating;
       add_header X-Cache-Status $upstream_cache_status;
 spec:
   rules: