Merge pull request #3569 from weaveworks/probe-k8s-once-yamls

Update example yamls to probe Kubernetes once per cluster

examples/k8s/ds.yaml

@@ -25,17 +25,12 @@ spec:
       containers:
         - name: scope-agent
           args:
-            - '--no-app'
+            - '--mode=probe'
+            - '--probe-only'
+            - '--probe.kubernetes.role=host'
             - '--probe.docker.bridge=docker0'
             - '--probe.docker=true'
-            - '--probe.kubernetes=true'
             - 'weave-scope-app.weave.svc.cluster.local:80'
-          env:
-            - name: KUBERNETES_NODENAME
-              valueFrom:
-                fieldRef:
-                  apiVersion: v1
-                  fieldPath: spec.nodeName
           image: weaveworks/scope:1.10.2
           imagePullPolicy: IfNotPresent
           securityContext:
@@ -50,7 +45,6 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       hostNetwork: true
       hostPID: true
-      serviceAccountName: weave-scope
       tolerations:
         - effect: NoSchedule
           operator: Exists

examples/k8s/probe-deploy.yaml

@@ -0,0 +1,44 @@
+# borrowed from https://cloud.weave.works/k8s/scope.yaml?k8s-version=1.9.3
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: weave-scope-cluster-agent
+  labels:
+    name: weave-scope-cluster-agent
+    app: weave-scope
+    weave-cloud-component: scope
+    weave-scope-component: cluster-agent
+  namespace: weave
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: weave-scope-cluster-agent
+      app: weave-scope
+      weave-cloud-component: scope
+      weave-scope-component: cluster-agent
+  revisionHistoryLimit: 2
+  template:
+    metadata:
+      labels:
+        name: weave-scope-cluster-agent
+        app: weave-scope
+        weave-cloud-component: scope
+        weave-scope-component: cluster-agent
+    spec:
+      containers:
+        - name: scope-cluster-agent
+          args:
+            - '--mode=probe'
+            - '--probe-only'
+            - '--probe.kubernetes.role=cluster'
+            - 'weave-scope-app.weave.svc.cluster.local.:80'
+          command:
+            - /home/weave/scope
+          image: 'docker.io/weaveworks/scope:1.10.2'
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+      serviceAccountName: weave-scope