Restructure ansible code

2020-05-18 20:43:22 +02:00 · 2020-05-18 20:43:22 +02:00 · 01c981c2c0
commit 01c981c2c0
parent c4347c6667
10 changed files with 105 additions and 211 deletions
--- a/templates/2.2/traefik-dp.yml.j2
+++ b/templates/2.2/traefik-dp.yml.j2
@ -21,7 +21,7 @@ spec:
      serviceAccountName: traefik-ingress-controller
      containers:
        - name: traefik
-          image: traefik:{{ traefik_version }}
+          image: traefik:{{ traefik_version_2_2 }}
          args:
            - --configfile=/config/traefik.yaml
 #          imagePullPolicy: IfNotPresent
--- a/templates/2.2/traefik-middleware-ipwhitelist.yml.j2
+++ b/templates/2.2/traefik-middleware-ipwhitelist.yml.j2
@ -1,11 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
-  name: traefik-ipwhitelist
-  namespace: {{ traefik_namespace }}
-spec:
-  ipWhiteList:
-    sourceRange:
-{% for acl_whitelist in ingress_whitelist %}
-      - {{ acl_whitelist }}
-{% endfor %}