Add annotations and ports to scrape weave metrics

upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template

@@ -130,6 +130,7 @@ spec:
         name: weave-net
         role.kubernetes.io/networking: "1"
       annotations:
+        prometheus.io/scrape: "true"
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
@@ -164,6 +165,9 @@ spec:
                   key: network-password
             {{- end }}
           image: 'weaveworks/weave-kube:2.5.1'
+          ports:
+            - name: metrics
+              containerPort: 6782
           readinessProbe:
             httpGet:
               host: 127.0.0.1
@@ -201,6 +205,9 @@ spec:
                   apiVersion: v1
                   fieldPath: spec.nodeName
           image: 'weaveworks/weave-npc:2.5.1'
+          ports:
+            - name: metrics
+              containerPort: 6781
           resources:
             requests:
               cpu: 50m

upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template

@@ -116,6 +116,7 @@ spec:
         name: weave-net
         role.kubernetes.io/networking: "1"
       annotations:
+        prometheus.io/scrape: "true"
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
@@ -146,6 +147,9 @@ spec:
                   key: network-password
             {{- end }}
           image: 'weaveworks/weave-kube:2.3.0'
+          ports:
+            - name: metrics
+              containerPort: 6782
           readinessProbe:
             httpGet:
               host: 127.0.0.1
@@ -182,6 +186,9 @@ spec:
                   apiVersion: v1
                   fieldPath: spec.nodeName
           image: 'weaveworks/weave-npc:2.3.0'
+          ports:
+            - name: metrics
+              containerPort: 6781
           resources:
             requests:
               cpu: 50m

upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template

@@ -126,6 +126,7 @@ spec:
         name: weave-net
         role.kubernetes.io/networking: "1"
       annotations:
+        prometheus.io/scrape: "true"
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
@@ -156,6 +157,9 @@ spec:
                   key: network-password
             {{- end }}
           image: 'weaveworks/weave-kube:2.5.1'
+          ports:
+            - name: metrics
+              containerPort: 6782
           readinessProbe:
             httpGet:
               host: 127.0.0.1
@@ -193,6 +197,9 @@ spec:
                   apiVersion: v1
                   fieldPath: spec.nodeName
           image: 'weaveworks/weave-npc:2.5.1'
+          ports:
+            - name: metrics
+              containerPort: 6781
           resources:
             requests:
               cpu: 50m

upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template

@@ -126,6 +126,7 @@ spec:
         name: weave-net
         role.kubernetes.io/networking: "1"
       annotations:
+        prometheus.io/scrape: "true"
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
@@ -160,6 +161,9 @@ spec:
                   key: network-password
             {{- end }}
           image: 'weaveworks/weave-kube:2.5.1'
+          ports:
+            - name: metrics
+              containerPort: 6782
           readinessProbe:
             httpGet:
               host: 127.0.0.1
@@ -197,6 +201,9 @@ spec:
                   apiVersion: v1
                   fieldPath: spec.nodeName
           image: 'weaveworks/weave-npc:2.5.1'
+          ports:
+            - name: metrics
+              containerPort: 6781
           resources:
             requests:
               cpu: 50m

upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template

@@ -19,6 +19,7 @@ spec:
   template:
     metadata:
       annotations:
+        prometheus.io/scrape: "true"
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: >-
           [{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"},{"key":"CriticalAddonsOnly", "operator":"Exists"}]
@@ -47,6 +48,9 @@ spec:
               value: "{{ .Networking.Weave.ConnLimit }}"
             {{- end }}
           image: 'weaveworks/weave-kube:2.3.0'
+          ports:
+            - name: metrics
+              containerPort: 6782
           livenessProbe:
             httpGet:
               host: 127.0.0.1
@@ -84,6 +88,9 @@ spec:
                   apiVersion: v1
                   fieldPath: spec.nodeName
           image: 'weaveworks/weave-npc:2.3.0'
+          ports:
+            - name: metrics
+              containerPort: 6781
           resources:
             requests:
               cpu: 50m