Refactor contrail-network-controller
* Rename kube-network-manager to contrail-network-controller
* Download image from artifactory rather than from docker hib
Change-Id: I35f543ba8008b5e3f8e5a27c00b5b7c88d7ee385
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
diff --git a/README.rst b/README.rst
index bf93fdb..7c2b224 100644
--- a/README.rst
+++ b/README.rst
@@ -268,9 +268,10 @@
kubernetes:
master:
addons:
- kube_network_manager:
+ contrail_network_controller:
enabled: true
namespace: kube-system
+ image: yashulyak/contrail-controller:latest
network:
engine: opencontrail
host: 10.0.170.70
@@ -284,7 +285,6 @@
network_label: name
service_label: uses
cluster_service: kube-system/default
- image: yashulyak/contrail-controller:latest
On pools:
.. code-block:: yaml
diff --git a/kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-configmap.yml b/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
similarity index 84%
rename from kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-configmap.yml
rename to kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
index e13dc3f..ebba5e2 100644
--- a/kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-configmap.yml
+++ b/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
@@ -1,9 +1,9 @@
-{%- from "kubernetes/map.jinja" import master with context %}
+{%- from "kubernetes/map.jinja" import master with context -%}
apiVersion: v1
kind: ConfigMap
metadata:
- name: kube-network-manager
- namespace: {{ master.addons.kube_network_manager.get('namespace', 'kube-system') }}
+ name: contrail-kube-manager
+ namespace: {{ master.addons.contrail_network_controller.get('namespace', 'kube-system') }}
data:
contrail.conf: |
[DEFAULT]
diff --git a/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-deploy.yml b/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-deploy.yml
new file mode 100644
index 0000000..b270309
--- /dev/null
+++ b/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-deploy.yml
@@ -0,0 +1,29 @@
+{%- from "kubernetes/map.jinja" import master with context -%}
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+ name: contrail-network-controller
+ namespace: {{ master.addons.contrail_network_controller.get('namespace', 'kube-system') }}
+spec:
+ template:
+ metadata:
+ labels:
+ app: contrail-network-controller
+ spec:
+ hostNetwork: true
+ tolerations:
+ - key: node-role.kubernetes.io/master
+ effect: NoSchedule
+ containers:
+ - name: contrail-kube-manager
+ image: {{ master.addons.contrail_network_controller.get('image', 'docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.0.0') }}
+ imagePullPolicy: Always
+ args: ["--config-file", "/etc/kube-manager/contrail.conf", "--alsologtostderr"]
+ volumeMounts:
+ - name: contrail-kube-manager
+ mountPath: /etc/kube-manager/
+ volumes:
+ - name: contrail-kube-manager
+ configMap:
+ name: contrail-kube-manager
+ restartPolicy: Always
diff --git a/kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-deploy.yml b/kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-deploy.yml
deleted file mode 100644
index 2e6a622..0000000
--- a/kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-deploy.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-{%- from "kubernetes/map.jinja" import master with context %}
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
- name: kube-network-manager
- namespace: {{ master.addons.kube_network_manager.get('namespace', 'kube-system') }}
-spec:
- template:
- metadata:
- labels:
- app: kube-network-manager
- spec:
- hostNetwork: true
- tolerations:
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
- containers:
- - name: contrail-kube-manager
- image: {{ master.network.get('image', 'yashulyak/contrail-controller:latest') }}
- imagePullPolicy: Always
- args: ["--config-file", "/etc/kube-manager/contrail.conf", "--alsologtostderr"]
- volumeMounts:
- - name: kube-network-manager
- mountPath: /etc/kube-manager/
- volumes:
- - name: kube-network-manager
- configMap:
- name: kube-network-manager
- restartPolicy: Always
diff --git a/kubernetes/master/kube-addons.sls b/kubernetes/master/kube-addons.sls
index ea857f5..ee8890c 100644
--- a/kubernetes/master/kube-addons.sls
+++ b/kubernetes/master/kube-addons.sls
@@ -9,17 +9,17 @@
- mode: 0755
{%- if master.network.engine == "opencontrail" %}
-/etc/kubernetes/addons/kube_network_manager/kube-network-manager-configmap.yml:
+/etc/kubernetes/addons/contrail_network_controller/contrail-network-controller-configmap.yml:
file.managed:
- - source: salt://kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-configmap.yml
+ - source: salt://kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
- template: jinja
- group: root
- dir_mode: 755
- makedirs: True
-/etc/kubernetes/addons/kube_network_manager/kube-network-manager-deploy.yml:
+/etc/kubernetes/addons/contrail_network_controller/contrail-network-controller-deploy.yml:
file.managed:
- - source: salt://kubernetes/files/kube-addons/kube-network-manager/kube-network-manager-deploy.yml
+ - source: salt://kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-deploy.yml
- template: jinja
- group: root
- dir_mode: 755
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 313409b..a7377c7 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -65,10 +65,10 @@
enabled: False
image: calico/kube-policy-controller:v0.5.4
namespace: kube-system
- kube_network_manager:
- enabled: False
- name: network-manager
- creates: deployment
+ contrail_network_controller:
+ enabled: true
+ namespace: kube-system
+ image: yashulyak/contrail-controller:latest
virtlet:
enabled: False
namespace: kube-system
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 0c815fe..14d9656 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -53,6 +53,10 @@
enabled: False
image: calico/kube-policy-controller:v0.5.4
namespace: kube-system
+ contrail_network_controller:
+ enabled: true
+ namespace: kube-system
+ image: yashulyak/contrail-controller:latest
virtlet:
enabled: False
namespace: kube-system
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index 39f9956..c237389 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -34,9 +34,10 @@
enabled: true
namespace: kube-system
image: image
- kube_network_manager:
+ contrail_network_controller:
enabled: true
namespace: kube-system
+ image: yashulyak/contrail-controller:latest
admin:
password: password
username: admin
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index b687840..8cf9c36 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -31,9 +31,10 @@
server_image: image
agent_image: image
agent_probeurls: "http://ipinfo.io"
- kube_network_manager:
+ contrail_network_controller:
enabled: true
namespace: kube-system
+ image: yashulyak/contrail-controller:latest
admin:
password: password
username: admin