Add virtlet runtime on all pool nodes
Change-Id: I40d1793a57f85139202e61db07684e58b73a714d
diff --git a/README.rst b/README.rst
index 662556a..3795e8f 100644
--- a/README.rst
+++ b/README.rst
@@ -71,9 +71,6 @@
enabled: true
namespace: kube-system
image: mirantis/virtlet:v1.0.3
- hosts:
- - cmp01
- - cmp02
Enable netchecker addon
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 19d233e..dfd9af9 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -28,6 +28,7 @@
{%- endif -%}
{%- else %}
--node-labels=node-role.kubernetes.io/node=true \
+--node-labels=extraRuntime=virtlet \
{%- endif %}
--network-plugin=cni \
--cni-bin-dir={{ pool.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
diff --git a/kubernetes/master/setup.sls b/kubernetes/master/setup.sls
index 86ca5b0..cac63d5 100644
--- a/kubernetes/master/setup.sls
+++ b/kubernetes/master/setup.sls
@@ -86,18 +86,4 @@
{%- endif %}
-{%- if common.addons.get('virtlet', {}).get('enabled') %}
-{% for host in common.addons.virtlet.hosts %}
-
-label_virtlet_{{ host }}:
- cmd.run:
- - name: kubectl label --overwrite node {{ host }} extraRuntime=virtlet
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
-
-{% endfor %}
-
-{%- endif %}
-
{%- endif %}
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 91c1ff3..1093758 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -37,9 +37,6 @@
virtlet:
enabled: true
namespace: kube-system
- hosts:
- - cmp01
- - cmp02
image: mirantis/virtlet:v1.0.3
monitoring:
backend: prometheus
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index 32478f7..8affa7d 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -38,9 +38,6 @@
enabled: true
namespace: kube-system
image: mirantis/virtlet:v1.0.3
- hosts:
- - cmp01
- - cmp02
contrail_network_controller:
enabled: true
namespace: kube-system
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index e6c6085..4b7bb31 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -38,9 +38,6 @@
enabled: true
namespace: kube-system
image: mirantis/virtlet:v1.0.3
- hosts:
- - cmp01
- - cmp02
monitoring:
backend: prometheus
master:
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index c75b87b..1b7d364 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -17,9 +17,6 @@
enabled: true
namespace: kube-system
image: mirantis/virtlet:v1.0.3
- hosts:
- - cmp01
- - cmp02
monitoring:
backend: prometheus
pool:
diff --git a/tests/pillar/pool_cluster_with_domain.sls b/tests/pillar/pool_cluster_with_domain.sls
index 4fea3dc..276c80f 100644
--- a/tests/pillar/pool_cluster_with_domain.sls
+++ b/tests/pillar/pool_cluster_with_domain.sls
@@ -17,9 +17,6 @@
enabled: true
namespace: kube-system
image: mirantis/virtlet:v1.0.3
- hosts:
- - cmp01
- - cmp02
monitoring:
backend: prometheus
pool:
diff --git a/tests/pillar/pool_contrail4_0.sls b/tests/pillar/pool_contrail4_0.sls
index 98c1cf7..cdb6c6f 100644
--- a/tests/pillar/pool_contrail4_0.sls
+++ b/tests/pillar/pool_contrail4_0.sls
@@ -17,9 +17,6 @@
enabled: true
namespace: kube-system
image: mirantis/virtlet:v1.0.3
- hosts:
- - cmp01
- - cmp02
monitoring:
backend: prometheus
pool: