Remove default prometheus annotations (#491)

* Remove default prometheus annotations

* codegen

Author: chunter0

changelog/v0.34.0/remove-hardcoded-annotations.yaml

@@ -0,0 +1,4 @@
+changelog:
+  - type: BREAKING_CHANGE
+    issueLink: https://github.com/solo-io/skv2/issues/490
+    description: Remove hardcoded prometheus pod annotations from operator templates.

codegen/cmd_test.go

@@ -1151,12 +1151,9 @@ var _ = Describe("Cmd", func() {
 			"extrapod": "labels",
 		}))
 		Expect(renderedDeployment.Spec.Template.Annotations).To(Equal(map[string]string{
-			"prometheus.io/port":     "9091",
-			"prometheus.io/scrape":   "true",
 			"app.kubernetes.io/name": "painter",
 			"extrapod":               "annotations",
 			"pod":                    "annotations",
-			"prometheus.io/path":     "/metrics",
 		}))
 		Expect(renderedService.Labels).To(Equal(map[string]string{
 			"app":          "painter",

codegen/templates/chart/operator-deployment.yamltmpl

@@ -67,9 +67,6 @@ spec:
         [[- end ]]
       annotations:
         app.kubernetes.io/name: [[ $operator.Name ]]
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
         [[- range $key, $value := $customPodAnnotations ]]
         [[ $key ]]: [[ $value ]]
         [[- end ]]

codegen/test/chart-envvars/templates/deployment.yaml

@@ -28,9 +28,6 @@ spec:
         app: painter
       annotations:
         app.kubernetes.io/name: painter
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: painter
       containers:

codegen/test/chart-no-desc/templates/deployment.yaml

@@ -32,9 +32,6 @@ spec:
         pod: labels
       annotations:
         app.kubernetes.io/name: painter
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
         pod: annotations
     spec:
       serviceAccountName: painter

codegen/test/chart-sidecar/templates/deployment.yaml

@@ -28,9 +28,6 @@ spec:
         app: painter
       annotations:
         app.kubernetes.io/name: painter
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: painter
       containers:

codegen/test/chart-svcport/templates/deployment.yaml

@@ -28,9 +28,6 @@ spec:
         app: painter
       annotations:
         app.kubernetes.io/name: painter
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: painter
       containers:

codegen/test/chart/conditional-sidecar/templates/deployment.yaml

@@ -28,9 +28,6 @@ spec:
         app: gloo-mgmt-server
       annotations:
         app.kubernetes.io/name: gloo-mgmt-server
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: gloo-mgmt-server
       volumes:
@@ -261,9 +258,6 @@ spec:
         app: gloo-agent
       annotations:
         app.kubernetes.io/name: gloo-agent
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: gloo-agent
       containers:

codegen/test/chart/templates/deployment.yaml

@@ -28,9 +28,6 @@ spec:
         app: painter
       annotations:
         app.kubernetes.io/name: painter
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: painter
       containers:

codegen/test/name_override_chart/templates/deployment.yaml

@@ -28,9 +28,6 @@ spec:
         app: painter-original-name
       annotations:
         app.kubernetes.io/name: painter-original-name
-        prometheus.io/path: /metrics
-        prometheus.io/port: "9091"
-        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: painter-original-name
       containers: