C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Netchecker version and namespace (#3705)

Browse source 
* Revert netchecker image and version

* Create namespace for netchecker

* Remove extra slashes
This commit is contained in:
Ryler Hockenbury 2018-11-14 12:27:45 -05:00 committed by k8s-ci-robot
parent 846c7a26e8
commit d8e9b0f675
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/download/defaults/main.yml
View file

@ -137,10 +137,10 @@ pod_infra_image_repo: "gcr.io/google_containers/pause-{{ image_arch }}"
pod_infra_image_tag: "{{ pod_infra_version }}" pod_infra_image_tag: "{{ pod_infra_version }}"
install_socat_image_repo: "xueshanf/install-socat" install_socat_image_repo: "xueshanf/install-socat"
install_socat_image_tag: "latest" install_socat_image_tag: "latest"
netcheck_version: "v1.2.2" netcheck_version: "v1.0"
netcheck_agent_image_repo: "mirantis/k8s-netchecker-agent" netcheck_agent_image_repo: "quay.io/l23network/k8s-netchecker-agent"
netcheck_agent_image_tag: "{{ netcheck_version }}" 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 }}" netcheck_server_image_tag: "{{ netcheck_version }}"
weave_kube_image_repo: "docker.io/weaveworks/weave-kube" weave_kube_image_repo: "docker.io/weaveworks/weave-kube"
weave_kube_image_tag: "{{ weave_version }}" weave_kube_image_tag: "{{ weave_version }}"

1
roles/kubernetes-apps/ansible/tasks/netchecker.yml
View file

@ -23,6 +23,7 @@
- name: Kubernetes Apps | Netchecker Templates list - name: Kubernetes Apps | Netchecker Templates list
set_fact: set_fact:
netchecker_templates: netchecker_templates:
- {file: netchecker-ns.yml, type: ns, name: netchecker-namespace}
- {file: netchecker-agent-sa.yml, type: sa, name: netchecker-agent} - {file: netchecker-agent-sa.yml, type: sa, name: netchecker-agent}
- {file: netchecker-agent-ds.yml, type: ds, 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} - {file: netchecker-agent-hostnet-ds.yml, type: ds, name: netchecker-agent-hostnet}

6
roles/kubernetes-apps/ansible/templates/netchecker-ns.yml.j2 Normal file
View file

@ -0,0 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: "{{ netcheck_namespace }}"
labels:
name: "{{ netcheck_namespace }}"