Weave-Scope: Fixed missing selectors

Author: fjudith

srv/salt/kubernetes/addons/weave-scope/config.sls

@@ -2,7 +2,7 @@
 # vim: ft=jinja
 
 {#- Get the `tplroot` from `tpldir` #}
-{%- from "kubernetes/map.jinja" import common with context -%}
+{% from "kubernetes/map.jinja" import common with context %}
 
 /srv/kubernetes/manifests/weave-scope:
   file.directory:
@@ -72,7 +72,7 @@
     - mode: "0644"
     - context:
         tpldir: {{ tpldir }}
-{%- else%}
+{%- else %}
 /srv/kubernetes/manifests/weave-scope/ds.yaml:
     require:
     - file: /srv/kubernetes/manifests/weave-scope

srv/salt/kubernetes/addons/weave-scope/templates/ds-containerd.yaml.j2

@@ -17,6 +17,9 @@ metadata:
   namespace: weave
 spec:
   minReadySeconds: 5
+  selector:
+    matchLabels:
+      app: weave-scope
   template:
     metadata:
       labels:
@@ -28,17 +31,17 @@ spec:
       containers:
         - name: scope-agent
           args:
+            {%- if common.cni.provider == "weave" %}
+            - '--weave=true'
+            {%- else %}
+            - '--weave=false'
+            {%- endif %}
             - '--no-app'
             - '--probe.docker=false'
             - '--probe.kubernetes=true'
             - '--probe.cri=true'
             - '--probe.cri.endpoint=unix:///run/containerd/containerd.sock'
             - 'weave-scope-app.weave.svc.cluster.local.:80'
-            {%- if common.cni.provider == "weave" %}
-            - '--weave=true'
-            {%- else %}
-            - '--weave=false'
-            {%- endif %}
           env:
             - name: KUBERNETES_NODENAME
               valueFrom:

srv/salt/kubernetes/addons/weave-scope/templates/ds-crio.yaml.j2

@@ -17,6 +17,9 @@ metadata:
   namespace: weave
 spec:
   minReadySeconds: 5
+  selector:
+    matchLabels:
+      app: weave-scope
   template:
     metadata:
       labels:
@@ -28,17 +31,17 @@ spec:
       containers:
         - name: scope-agent
           args:
+            {%- if common.cni.provider == "weave" %}
+            - '--weave=true'
+            {%- else %}
+            - '--weave=false'
+            {%- endif %}
             - '--no-app'
             - '--probe.docker=false'
             - '--probe.kubernetes=true'
             - '--probe.cri=true'
             - '--probe.cri.endpoint=unix:///var/run/crio/crio.sock'
             - 'weave-scope-app.weave.svc.cluster.local.:80'
-            {%- if common.cni.provider == "weave" %}
-            - '--weave=true'
-            {%- else %}
-            - '--weave=false'
-            {%- endif %}
           env:
             - name: KUBERNETES_NODENAME
               valueFrom:

srv/salt/kubernetes/addons/weave-scope/templates/ds.yaml.j2

@@ -32,17 +32,17 @@ spec:
       containers:
         - name: scope-agent
           args:
+            {%- if common.cni.provider == "weave" %}
+            - '--weave=true'
+            {%- else %}
+            - '--weave=false'
+            {%- endif %}
             - '--mode=probe'
             - '--probe-only'
             - '--probe.kubernetes.role=host'
             - '--probe.docker.bridge=docker0'
             - '--probe.docker=true'
             - 'weave-scope-app.weave.svc.cluster.local.:80'
-            {%- if common.cni.provider == "weave" %}
-            - '--weave=true'
-            {%- else %}
-            - '--weave=false'
-            {%- endif %}
           env:
             - name: SCOPE_HOSTNAME
               valueFrom:

srv/salt/kubernetes/addons/weave-scope/templates/probe-deploy.yaml.j2

@@ -36,15 +36,15 @@ spec:
       containers:
         - name: scope-cluster-agent
           args:
-            - '--mode=probe'
-            - '--probe-only'
-            - '--probe.kubernetes.role=cluster'
-            - 'weave-scope-app.weave.svc.cluster.local.:80'
             {%- if common.cni.provider == "weave" %}
             - '--weave=true'
             {%- else %}
             - '--weave=false'
             {%- endif %}
+            - '--mode=probe'
+            - '--probe-only'
+            - '--probe.kubernetes.role=cluster'
+            - 'weave-scope-app.weave.svc.cluster.local.:80'
           command:
             - /home/weave/scope
           image: '{{ weave_scope.image }}'