From f668bb276c2d69f0616939b12c6fa19e6004cde8 Mon Sep 17 00:00:00 2001 From: Adrien Date: Tue, 6 Oct 2020 22:59:34 +0200 Subject: [PATCH] Add version 2.3 --- defaults/main.yml | 2 +- tasks/main.yml | 3 ++- templates/2.3/traefik-clusterrole.yml.j2 | 2 ++ templates/2.3/traefik-crd-ingressroutes.yml.j2 | 3 --- templates/2.3/traefik-crd-ingressroutetcps.yml.j2 | 3 --- templates/2.3/traefik-crd-ingressrouteudps.yml.j2 | 3 --- templates/2.3/traefik-crd-middlewares.yml.j2 | 3 --- templates/2.3/traefik-crd-tlsoptions.yml.j2 | 3 --- templates/2.3/traefik-crd-tlsstores.yml.j2 | 3 --- templates/2.3/traefik-crd-traefikservices.yml.j2 | 5 +---- vars/main.yml | 12 ++++++++++++ 11 files changed, 18 insertions(+), 24 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0fc87cf..07a1970 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ my_context: kubernetes -traefik_version: "2.2" +traefik_version: "2.3" traefik_domain: "local" traefik_namespace: "traefik" #ingress_whitelist: diff --git a/tasks/main.yml b/tasks/main.yml index 3630314..1e57147 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -49,7 +49,7 @@ k8s_info: context: "{{ my_context }}" api_version: v1 - kind: DaemonSet + kind: Deployment name: traefik namespace: '{{ traefik_namespace }}' field_selectors: @@ -77,6 +77,7 @@ k8s: state: "present" context: "{{ my_context }}" + namespace: '{{ traefik_namespace }}' merge_type: merge resource_definition: "{{ lookup('template', item) | from_yaml }}" with_items: diff --git a/templates/2.3/traefik-clusterrole.yml.j2 b/templates/2.3/traefik-clusterrole.yml.j2 index bef2410..50b65c9 100644 --- a/templates/2.3/traefik-clusterrole.yml.j2 +++ b/templates/2.3/traefik-clusterrole.yml.j2 @@ -20,8 +20,10 @@ rules: - watch - apiGroups: - extensions + - networking.k8s.io resources: - ingresses + - ingressclasses verbs: - get - list diff --git a/templates/2.3/traefik-crd-ingressroutes.yml.j2 b/templates/2.3/traefik-crd-ingressroutes.yml.j2 index f31a6bd..0bcfd35 100644 --- a/templates/2.3/traefik-crd-ingressroutes.yml.j2 +++ b/templates/2.3/traefik-crd-ingressroutes.yml.j2 @@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: ingressroutes.traefik.containo.us - namespace: {{ traefik_namespace }} - labels: - app: traefik spec: group: traefik.containo.us diff --git a/templates/2.3/traefik-crd-ingressroutetcps.yml.j2 b/templates/2.3/traefik-crd-ingressroutetcps.yml.j2 index a766ed8..36b202a 100644 --- a/templates/2.3/traefik-crd-ingressroutetcps.yml.j2 +++ b/templates/2.3/traefik-crd-ingressroutetcps.yml.j2 @@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: ingressroutetcps.traefik.containo.us - namespace: {{ traefik_namespace }} - labels: - app: traefik spec: group: traefik.containo.us diff --git a/templates/2.3/traefik-crd-ingressrouteudps.yml.j2 b/templates/2.3/traefik-crd-ingressrouteudps.yml.j2 index 535726c..d7c2624 100644 --- a/templates/2.3/traefik-crd-ingressrouteudps.yml.j2 +++ b/templates/2.3/traefik-crd-ingressrouteudps.yml.j2 @@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: ingressrouteudps.traefik.containo.us - namespace: {{ traefik_namespace }} - labels: - app: traefik spec: group: traefik.containo.us diff --git a/templates/2.3/traefik-crd-middlewares.yml.j2 b/templates/2.3/traefik-crd-middlewares.yml.j2 index 1c0168e..d1ae35f 100644 --- a/templates/2.3/traefik-crd-middlewares.yml.j2 +++ b/templates/2.3/traefik-crd-middlewares.yml.j2 @@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: middlewares.traefik.containo.us - namespace: {{ traefik_namespace }} - labels: - app: traefik spec: group: traefik.containo.us diff --git a/templates/2.3/traefik-crd-tlsoptions.yml.j2 b/templates/2.3/traefik-crd-tlsoptions.yml.j2 index a1200f0..1495e0d 100644 --- a/templates/2.3/traefik-crd-tlsoptions.yml.j2 +++ b/templates/2.3/traefik-crd-tlsoptions.yml.j2 @@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: tlsoptions.traefik.containo.us - namespace: {{ traefik_namespace }} - labels: - app: traefik spec: group: traefik.containo.us diff --git a/templates/2.3/traefik-crd-tlsstores.yml.j2 b/templates/2.3/traefik-crd-tlsstores.yml.j2 index eae918f..f9a4005 100644 --- a/templates/2.3/traefik-crd-tlsstores.yml.j2 +++ b/templates/2.3/traefik-crd-tlsstores.yml.j2 @@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: tlsstores.traefik.containo.us - namespace: {{ traefik_namespace }} - labels: - app: traefik spec: group: traefik.containo.us diff --git a/templates/2.3/traefik-crd-traefikservices.yml.j2 b/templates/2.3/traefik-crd-traefikservices.yml.j2 index 46ce7ca..3262c43 100644 --- a/templates/2.3/traefik-crd-traefikservices.yml.j2 +++ b/templates/2.3/traefik-crd-traefikservices.yml.j2 @@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: traefikservices.traefik.containo.us - namespace: {{ traefik_namespace }} - labels: - app: traefik spec: group: traefik.containo.us @@ -13,4 +10,4 @@ spec: kind: TraefikService plural: traefikservices singular: traefikservice - scope: Namespaced + scope: Namespaced \ No newline at end of file diff --git a/vars/main.yml b/vars/main.yml index b63e505..e77897e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -28,3 +28,15 @@ traefik_2_2_list: - 2.2/traefik-crd-traefikservices.yml.j2 - 2.2/traefik-clusterrole.yml.j2 - 2.2/traefik-clusterrolebinding.yml.j2 + +traefik_version_2_3: 2.3.1 +traefik_2_3_list: + - 2.3/traefik-crd-ingressroutes.yml.j2 + - 2.3/traefik-crd-ingressroutetcps.yml.j2 + - 2.3/traefik-crd-ingressrouteudps.yml.j2 + - 2.3/traefik-crd-middlewares.yml.j2 + - 2.3/traefik-crd-tlsoptions.yml.j2 + - 2.3/traefik-crd-tlsstores.yml.j2 + - 2.3/traefik-crd-traefikservices.yml.j2 + - 2.3/traefik-clusterrole.yml.j2 + - 2.3/traefik-clusterrolebinding.yml.j2