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

More cleaner vars names

Browse source
This commit is contained in:
Adrien Reslinger 2020-07-13 15:38:46 +02:00
parent c0b4a9d16d
commit a9faf1337c
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tasks/main.yml
View file

@ -66,7 +66,7 @@
context: "{{ my_context }}" context: "{{ my_context }}"
resource_definition: "{{ lookup('template', item) | from_yaml }}" resource_definition: "{{ lookup('template', item) | from_yaml }}"
with_items: with_items:
- "{{ lookup('vars', 'traefik_' + traefik_actual_version.stdout + '_list') | reverse | list }}" - "{{ lookup('vars', 'traefik_' + traefik_actual_version.stdout | regex_replace('[.]','_') + '_list') | reverse | list }}"
# - hostvars[inventory_hostname]['traefik_' + traefik_actual_version.stdout + '_list'] | reverse # - hostvars[inventory_hostname]['traefik_' + traefik_actual_version.stdout + '_list'] | reverse
when: when:
- not traefik_actual_version.stdout == "[]" - not traefik_actual_version.stdout == "[]"
@ -80,7 +80,7 @@
merge_type: merge merge_type: merge
resource_definition: "{{ lookup('template', item) | from_yaml }}" resource_definition: "{{ lookup('template', item) | from_yaml }}"
with_items: with_items:
- "{{ lookup('vars', 'traefik_' + traefik_version + '_list') }}" - "{{ lookup('vars', 'traefik_' + traefik_version | regex_replace('[.]','_') + '_list') }}"
- traefik-cm.yml.j2 - traefik-cm.yml.j2
- traefik-sa.yml.j2 - traefik-sa.yml.j2
- traefik-dp.yml.j2 - traefik-dp.yml.j2

4
templates/traefik-dp.yml.j2
View file

@ -21,7 +21,7 @@ spec:
serviceAccountName: traefik-ingress-controller serviceAccountName: traefik-ingress-controller
containers: containers:
- name: traefik - name: traefik
image: traefik:{{ lookup('vars', 'traefik_version_' + traefik_version | regex_replace('\.','_') ) }} image: traefik:{{ lookup('vars', 'traefik_version_' + traefik_version | regex_replace('\.','_')) }}
args: args:
- --configfile=/config/traefik.yaml - --configfile=/config/traefik.yaml
# imagePullPolicy: IfNotPresent # imagePullPolicy: IfNotPresent
@ -68,7 +68,7 @@ spec:
name: config name: config
{% if traefik_node_selector is defined %} {% if traefik_node_selector is defined %}
nodeSelector: nodeSelector:
flaminem.com/entrypoint: traefik reslinger.net/entrypoint: traefik
{% endif %} {% endif %}
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
{% if my_context == "flamykube" %} {% if my_context == "flamykube" %}

6
vars/main.yml
View file

@ -1,5 +1,5 @@
traefik_version_2_0: 2.0.7 traefik_version_2_0: 2.0.7
traefik_2.0_list: traefik_2_0_list:
- 2.0/traefik-clusterrole.yml.j2 - 2.0/traefik-clusterrole.yml.j2
- 2.0/traefik-clusterrolebinding.yml.j2 - 2.0/traefik-clusterrolebinding.yml.j2
- 2.0/traefik-crd-ingressroute.yml.j2 - 2.0/traefik-crd-ingressroute.yml.j2
@ -8,7 +8,7 @@ traefik_2.0_list:
- 2.0/traefik-crd-tlsoption.yml.j2 - 2.0/traefik-crd-tlsoption.yml.j2
traefik_version_2_1: 2.1.9 traefik_version_2_1: 2.1.9
traefik_2.1_list: traefik_2_1_list:
- 2.1/traefik-clusterrole.yml.j2 - 2.1/traefik-clusterrole.yml.j2
- 2.1/traefik-clusterrolebinding.yml.j2 - 2.1/traefik-clusterrolebinding.yml.j2
- 2.1/traefik-crd-ingressroute.yml.j2 - 2.1/traefik-crd-ingressroute.yml.j2
@ -18,7 +18,7 @@ traefik_2.1_list:
- 2.1/traefik-crd-traefikservice.yml.j2 - 2.1/traefik-crd-traefikservice.yml.j2
traefik_version_2_2: 2.2.4 traefik_version_2_2: 2.2.4
traefik_2.2_list: traefik_2_2_list:
- 2.2/traefik-crd-ingressroutes.yml.j2 - 2.2/traefik-crd-ingressroutes.yml.j2
- 2.2/traefik-crd-ingressroutetcps.yml.j2 - 2.2/traefik-crd-ingressroutetcps.yml.j2
- 2.2/traefik-crd-ingressrouteudps.yml.j2 - 2.2/traefik-crd-ingressrouteudps.yml.j2