move prometheus annotations to podspec (#70)

apigee · Sep 14, 2020 · 84c85f1 · 84c85f1
1 parent 50f9095
commit 84c85f1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/templates/istio-1.6/apigee-envoy-adapter.yaml b/templates/istio-1.6/apigee-envoy-adapter.yaml
@@ -3,20 +3,20 @@ kind: Deployment
 metadata:
   name: apigee-remote-service-envoy
   namespace: {{.Namespace}}
-  annotations:
-    sidecar.istio.io/rewriteAppHTTPProbers: "true"
-    prometheus.io/path: /metrics
-    prometheus.io/port: "5001"
-    prometheus.io/scheme: https
-    prometheus.io/scrape: "true"
-    prometheus.io/type: prometheusspec
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: apigee-remote-service-envoy
   template:
     metadata:
+      annotations:
+        sidecar.istio.io/rewriteAppHTTPProbers: "true"
+        prometheus.io/path: /metrics
+        prometheus.io/port: "5001"
+        prometheus.io/scheme: https
+        prometheus.io/scrape: "true"
+        prometheus.io/type: prometheusspec
       labels:
         app: apigee-remote-service-envoy
         version: v1

diff --git a/templates/istio-1.7/apigee-envoy-adapter.yaml b/templates/istio-1.7/apigee-envoy-adapter.yaml
@@ -3,20 +3,20 @@ kind: Deployment
 metadata:
   name: apigee-remote-service-envoy
   namespace: {{.Namespace}}
-  annotations:
-    sidecar.istio.io/rewriteAppHTTPProbers: "true"
-    prometheus.io/path: /metrics
-    prometheus.io/port: "5001"
-    prometheus.io/scheme: https
-    prometheus.io/scrape: "true"
-    prometheus.io/type: prometheusspec
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: apigee-remote-service-envoy
   template:
     metadata:
+      annotations:
+        sidecar.istio.io/rewriteAppHTTPProbers: "true"
+        prometheus.io/path: /metrics
+        prometheus.io/port: "5001"
+        prometheus.io/scheme: https
+        prometheus.io/scrape: "true"
+        prometheus.io/type: prometheusspec
       labels:
         app: apigee-remote-service-envoy
         version: v1

diff --git a/templates/templates.go b/templates/templates.go