Merge branch v2.10 into v3.0

integration/fixtures/k8s/03-ingressroute-containous.yml

@@ -0,0 +1,93 @@
+# This IngressRoute is expected to be ignored, because it already declared in API GroupVersion "traefik.io/v1alpha1".
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: test.route
+  namespace: default
+  labels:
+    app: traefik
+
+spec:
+  entryPoints:
+    - web
+
+  routes:
+    - match: Host(`collision`)
+      kind: Rule
+      priority: 12
+      services:
+        - name: whoami
+          port: 80
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: test.route.containous
+  namespace: default
+  labels:
+    app: traefik
+
+spec:
+  entryPoints:
+    - web
+
+  routes:
+  - match: Host(`bar.com`) && PathPrefix(`/foo`)
+    kind: Rule
+    priority: 12
+    middlewares:
+      - name: stripprefix-containous
+    services:
+    - name: whoami
+      port: 80
+
+  tls:
+    options:
+      name: mytlsoption-containous
+    store:
+      name: mytlsstore-containous
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: stripprefix-containous
+  namespace: default
+  labels:
+    app: traefik
+
+spec:
+  stripPrefix:
+    prefixes:
+      - /tobestripped
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: TLSOption
+metadata:
+  name: mytlsoption-containous
+  namespace: default
+  labels:
+    app: traefik
+
+spec:
+  minVersion: VersionTLS12
+  sniStrict: true
+  cipherSuites:
+    - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+    - TLS_RSA_WITH_AES_256_GCM_SHA384
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: TLSStore
+metadata:
+  name: mytlsstore-containous
+  namespace: default
+  labels:
+    app: traefik
+
+spec:
+  defaultCertificate:
+    secretName: tls-cert

integration/fixtures/k8s/03-ingressroute.yml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: test.route

integration/fixtures/k8s/03-tlsoption.yml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: TLSOption
 metadata:
   name: mytlsoption

integration/fixtures/k8s/03-tlsstore.yml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: TLSStore
 metadata:
   name: mytlsstore

integration/fixtures/k8s/04-ingressroute.yml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: mychain
@@ -10,7 +10,7 @@ spec:
       - name: stripprefix
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: stripprefix
@@ -22,7 +22,7 @@ spec:
       - /tobestripped
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: test2.route

integration/fixtures/k8s/05-ingressroutetcp-containous.yml

@@ -0,0 +1,22 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRouteTCP
+metadata:
+  name: test3.route-containous
+  namespace: default
+
+spec:
+  entryPoints:
+    - footcp
+  routes:
+  - match: HostSNI(`*`)
+    services:
+    - name: whoamitcp
+      namespace: default
+      port: 8080
+    - name: externalname-svc
+      port: 9090
+  tls:
+    options:
+      name: mytlsoption-containous
+    store:
+      name: mytlsstore-containous

integration/fixtures/k8s/05-ingressroutetcp.yml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRouteTCP
 metadata:
   name: test3.route

integration/fixtures/k8s/05-ingressrouteudp-containous.yml

@@ -0,0 +1,16 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRouteUDP
+metadata:
+  name: test3.route-containous
+  namespace: default
+
+spec:
+  entryPoints:
+    - fooudp
+  routes:
+  - services:
+    - name: whoamiudp
+      namespace: default
+      port: 8090
+    - name: externalname-svc
+      port: 9090

integration/fixtures/k8s/05-ingressrouteudp.yml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRouteUDP
 metadata:
   name: test3.route

integration/fixtures/k8s/06-ingressroute-traefikservices.yml

@@ -1,5 +1,5 @@
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: TraefikService
 metadata:
   name: mirror1
@@ -14,7 +14,7 @@ spec:
         port: 80
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: TraefikService
 metadata:
   name: wrr1
@@ -29,7 +29,7 @@ spec:
         port: 80
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: test3.route
@@ -45,7 +45,7 @@ spec:
         - name: wrr1
           kind: TraefikService
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: api.route

integration/fixtures/k8s/07-ingressroute-cross-namespace.yml

@@ -20,7 +20,7 @@ spec:
     task: whoami
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: test6.route
@@ -65,7 +65,7 @@ spec:
     - name: test-errorpage
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: TraefikService
 metadata:
   name: wrr2
@@ -78,7 +78,7 @@ spec:
         port: 80
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: TraefikService
 metadata:
   name: wrr3
@@ -92,7 +92,7 @@ spec:
         port: 80
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: stripprefix2
@@ -104,7 +104,7 @@ spec:
       - /tobestripped
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: test-errorpage

integration/fixtures/k8s/07-ingressroute-serverstransport.yml

@@ -1,5 +1,5 @@
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: testst.route
@@ -17,7 +17,7 @@ spec:
       serversTransport: mytransport
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: ServersTransport
 metadata:
   name: mytransport