From d8e9b0f6752bf5da4119de4679e44ec29b58a6ef Mon Sep 17 00:00:00 2001
From: Ryler Hockenbury <rhockenbury@users.noreply.github.com>
Date: Wed, 14 Nov 2018 12:27:45 -0500
Subject: [PATCH] Netchecker version and namespace (#3705)

* Revert netchecker image and version

* Create namespace for netchecker

* Remove extra slashes
---
 roles/download/defaults/main.yml                            | 6 +++---
 roles/kubernetes-apps/ansible/tasks/netchecker.yml          | 1 +
 .../kubernetes-apps/ansible/templates/netchecker-ns.yml.j2  | 6 ++++++
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 roles/kubernetes-apps/ansible/templates/netchecker-ns.yml.j2

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index a99c4849c..e924465a0 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -137,10 +137,10 @@ pod_infra_image_repo: "gcr.io/google_containers/pause-{{ image_arch }}"
 pod_infra_image_tag: "{{ pod_infra_version }}"
 install_socat_image_repo: "xueshanf/install-socat"
 install_socat_image_tag: "latest"
-netcheck_version: "v1.2.2"
-netcheck_agent_image_repo: "mirantis/k8s-netchecker-agent"
+netcheck_version: "v1.0"
+netcheck_agent_image_repo: "quay.io/l23network/k8s-netchecker-agent"
 netcheck_agent_image_tag: "{{ netcheck_version }}"
-netcheck_server_image_repo: "mirantis/k8s-netchecker-server"
+netcheck_server_image_repo: "quay.io/l23network/k8s-netchecker-server"
 netcheck_server_image_tag: "{{ netcheck_version }}"
 weave_kube_image_repo: "docker.io/weaveworks/weave-kube"
 weave_kube_image_tag: "{{ weave_version }}"
diff --git a/roles/kubernetes-apps/ansible/tasks/netchecker.yml b/roles/kubernetes-apps/ansible/tasks/netchecker.yml
index 46e033667..01720eaf7 100644
--- a/roles/kubernetes-apps/ansible/tasks/netchecker.yml
+++ b/roles/kubernetes-apps/ansible/tasks/netchecker.yml
@@ -23,6 +23,7 @@
 - name: Kubernetes Apps | Netchecker Templates list
   set_fact:
     netchecker_templates:
+      - {file: netchecker-ns.yml, type: ns, name: netchecker-namespace}
       - {file: netchecker-agent-sa.yml, type: sa, name: netchecker-agent}
       - {file: netchecker-agent-ds.yml, type: ds, name: netchecker-agent}
       - {file: netchecker-agent-hostnet-ds.yml, type: ds, name: netchecker-agent-hostnet}
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-ns.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-ns.yml.j2
new file mode 100644
index 000000000..3dd87aa2c
--- /dev/null
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-ns.yml.j2
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: "{{ netcheck_namespace }}"
+  labels:
+    name: "{{ netcheck_namespace }}"