Add component names to labels where appropriate

Signed-off-by: Roman Mohr <[email protected]>
guangxuli · Dec 5, 2017 · 56e013e · 56e013e
1 parent b95ebf4
commit 56e013e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/cluster/deploy.sh b/cluster/deploy.sh
@@ -63,8 +63,8 @@ elif [ "$TARGET" = "vagrant-release"  ]; then
 fi
 
 ## Expose common services
-$KUBECTL expose deployment haproxy --port 8184 -l 'kubevirt.io=' -n kube-system --external-ip $master_ip
-$KUBECTL expose deployment spice-proxy --port 3128 -l 'kubevirt.io=' -n kube-system --external-ip $master_ip
+$KUBECTL expose deployment haproxy --port 8184 -l 'kubevirt.io=haproxy' -n kube-system --external-ip $master_ip
+$KUBECTL expose deployment spice-proxy --port 3128 -l 'kubevirt.io=spice-proxy' -n kube-system --external-ip $master_ip
 
 # Deploy additional infra for testing
 $KUBECTL create -f manifests/testing -R $i

diff --git a/manifests/dev/haproxy.yaml.in b/manifests/dev/haproxy.yaml.in
@@ -4,7 +4,7 @@ metadata:
   name: haproxy
   namespace: kube-system
   labels:
-      kubevirt.io: ""
+      kubevirt.io: "haproxy"
 spec:
   template:
     metadata:

diff --git a/manifests/dev/libvirt.yaml.in b/manifests/dev/libvirt.yaml.in
@@ -4,7 +4,7 @@ metadata:
   name: libvirt
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "libvirt"
 spec:
   template:
     metadata:

diff --git a/manifests/dev/squid.yaml.in b/manifests/dev/squid.yaml.in
@@ -4,7 +4,7 @@ metadata:
   name: spice-proxy
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "spice-proxy"
 spec:
   template:
     metadata:

diff --git a/manifests/dev/virt-api.yaml.in b/manifests/dev/virt-api.yaml.in
@@ -4,7 +4,7 @@ metadata:
   name: virt-api
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-api"
 spec:
   ports:
     - port: 8183
@@ -18,7 +18,7 @@ metadata:
   name: virt-api
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-api"
 spec:
   template:
     metadata:

diff --git a/manifests/dev/virt-controller.yaml.in b/manifests/dev/virt-controller.yaml.in
@@ -4,7 +4,7 @@ metadata:
   name: virt-controller
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-controller"
 spec:
   ports:
     - port: 8182
@@ -18,7 +18,7 @@ metadata:
   name: virt-controller
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-controller"
 spec:
   replicas: 2
   template:

diff --git a/manifests/dev/virt-handler.yaml.in b/manifests/dev/virt-handler.yaml.in
@@ -4,7 +4,7 @@ metadata:
   name: virt-handler
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-handler"
 spec:
   template:
     metadata:

diff --git a/manifests/release/kubevirt.yaml.in b/manifests/release/kubevirt.yaml.in
@@ -149,7 +149,7 @@ metadata:
   name: haproxy
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "haproxy"
 spec:
   template:
     metadata:
@@ -187,7 +187,7 @@ metadata:
   name: virt-api
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-api"
 spec:
   ports:
     - port: 8183
@@ -201,7 +201,7 @@ metadata:
   name: virt-api
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-api"
 spec:
   template:
     metadata:
@@ -233,7 +233,7 @@ metadata:
   name: virt-controller
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-controller"
 spec:
   replicas: 2
   template:
@@ -281,7 +281,7 @@ metadata:
   name: virt-handler
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "virt-handler"
 spec:
   template:
     metadata:
@@ -333,7 +333,7 @@ metadata:
   name: libvirt
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "libvirt"
 spec:
   template:
     metadata:

diff --git a/manifests/release/spice-proxy.yaml.in b/manifests/release/spice-proxy.yaml.in
@@ -4,7 +4,7 @@ metadata:
   name: spice-proxy
   namespace: kube-system
   labels:
-    kubevirt.io: ""
+    kubevirt.io: "spice-proxy"
 spec:
   template:
     metadata: