From 1191378e7150342114560346da6993a12ba2f191 Mon Sep 17 00:00:00 2001
From: Luwei Ge <lwge@google.com>
Date: Fri, 19 Feb 2021 11:13:44 -0500
Subject: [PATCH] fixed the templates (#170)

---
 cmd/samples/templates/istio-1.7/apigee-envoy-adapter.yaml | 4 ++++
 cmd/samples/templates/istio-1.9/apigee-envoy-adapter.yaml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/cmd/samples/templates/istio-1.7/apigee-envoy-adapter.yaml b/cmd/samples/templates/istio-1.7/apigee-envoy-adapter.yaml
index ace8993..dbb65af 100644
--- a/cmd/samples/templates/istio-1.7/apigee-envoy-adapter.yaml
+++ b/cmd/samples/templates/istio-1.7/apigee-envoy-adapter.yaml
@@ -61,9 +61,11 @@ spec:
           name: apigee-remote-service-envoy
           readOnly: true
 {{- if .IsGCPManaged}}
+  {{- if .AnalyticsSecret}}
         - mountPath: /analytics-secret
           name: analytics-secret
           readOnly: true
+  {{- end}}
         - mountPath: /policy-secret
           name: policy-secret
           readOnly: true
@@ -73,10 +75,12 @@ spec:
         configMap:
           name: apigee-remote-service-envoy
 {{- if .IsGCPManaged}}
+  {{- if .AnalyticsSecret}}
       - name: analytics-secret
         secret:
           defaultMode: 420
           secretName: {{.Org}}-{{.Env}}-analytics-secret
+  {{- end}}
       - name: policy-secret
         secret:
           defaultMode: 420
diff --git a/cmd/samples/templates/istio-1.9/apigee-envoy-adapter.yaml b/cmd/samples/templates/istio-1.9/apigee-envoy-adapter.yaml
index ace8993..dbb65af 100644
--- a/cmd/samples/templates/istio-1.9/apigee-envoy-adapter.yaml
+++ b/cmd/samples/templates/istio-1.9/apigee-envoy-adapter.yaml
@@ -61,9 +61,11 @@ spec:
           name: apigee-remote-service-envoy
           readOnly: true
 {{- if .IsGCPManaged}}
+  {{- if .AnalyticsSecret}}
         - mountPath: /analytics-secret
           name: analytics-secret
           readOnly: true
+  {{- end}}
         - mountPath: /policy-secret
           name: policy-secret
           readOnly: true
@@ -73,10 +75,12 @@ spec:
         configMap:
           name: apigee-remote-service-envoy
 {{- if .IsGCPManaged}}
+  {{- if .AnalyticsSecret}}
       - name: analytics-secret
         secret:
           defaultMode: 420
           secretName: {{.Org}}-{{.Env}}-analytics-secret
+  {{- end}}
       - name: policy-secret
         secret:
           defaultMode: 420