Merge pull request #5426 from aleerizw/update-kube-router-manifest

Added metrics port and health check to kube-router

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

@@ -42,12 +42,19 @@ spec:
         - --run-router=true
         - --run-firewall=true
         - --run-service-proxy=true
+        - --metrics-port=12013
         - --kubeconfig=/var/lib/kube-router/kubeconfig
         env:
         - name: NODE_NAME
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 20244
+          initialDelaySeconds: 10
+          periodSeconds: 3
         resources:
           requests:
             cpu: 100m
@@ -105,7 +112,7 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: kube-router 
+  name: kube-router
   namespace: kube-system
 ---
 # Kube-router roles

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -659,7 +659,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Kuberouter != nil {
 		key := "networking.kuberouter"
-		version := "0.1.1-kops.1"
+		version := "0.1.1-kops.2"
 
 		{
 			location := key + "/k8s-1.6.yaml"