adrien/ansible-role-k8s-weave
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix for traefik 2.x

Browse source
This commit is contained in:
Adrien Reslinger 2019-12-12 11:11:33 +01:00
parent 5fbb40ffda
commit fe44d97ed7
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tasks/main.yml
View file

@ -26,7 +26,7 @@
basic_auth: "{{ basic_auth_data | b64encode }}" basic_auth: "{{ basic_auth_data | b64encode }}"
when: when:
- basic_auth == true - basic_auth == true
- traefik_version is not defined or traefik_version == "1.7" - traefik_version is not defined or traefik_version | regex_search('(1.)')
tags: weave tags: weave
- name: Remove a Secret object for basic authentification (traefik 1.7) - name: Remove a Secret object for basic authentification (traefik 1.7)
@ -44,7 +44,7 @@
basic_auth: "{{ basic_auth_data | b64encode }}" basic_auth: "{{ basic_auth_data | b64encode }}"
when: when:
- traefik_version is defined - traefik_version is defined
- traefik_version != "1.7" - traefik_version | regex_search('(2.)')
tags: weave tags: weave
- name: Remove old existing Ingress object - name: Remove old existing Ingress object
@ -57,7 +57,7 @@
name: weave name: weave
when: when:
- traefik_version is defined - traefik_version is defined
- traefik_version != "1.7" - traefik_version | regex_search('(2.)')
# file found https://github.com/weaveworks/scope/tree/master/examples/k8s/ # file found https://github.com/weaveworks/scope/tree/master/examples/k8s/
- name: Weave Scope files - name: Weave Scope files

2
templates/weave_ingress.yaml.j2
View file

@ -25,7 +25,7 @@ spec:
serviceName: weave-scope-app serviceName: weave-scope-app
servicePort: 80 servicePort: 80
{% else %} {% else %}
{% if traefik_version == "2.0" %} {% if traefik_version | regex_search('(2.)') %}
apiVersion: traefik.containo.us/v1alpha1 apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute kind: IngressRoute
metadata: metadata: