Merge branch v3.4 into master

integration/fixtures/https/max_concurrent_stream.toml

@@ -0,0 +1,28 @@
+[global]
+  checkNewVersion = false
+  sendAnonymousUsage = false
+
+[log]
+  level = "DEBUG"
+
+[serversTransport]
+  insecureSkipVerify=true
+
+[entryPoints]
+  [entryPoints.web]
+    address = ":8000"
+    [entryPoints.web.http2]
+      maxConcurrentStreams = 42
+
+[api]
+  insecure = true
+
+[providers.file]
+  filename = "{{ .SelfFilename }}"
+
+## dynamic configuration ##
+
+[tls.stores]
+  [tls.stores.default.defaultCertificate]
+    certFile = "resources/tls/local.cert"
+    keyFile = "resources/tls/local.key"

integration/fixtures/k8s/01-traefik-crd.yml

@@ -2291,7 +2291,7 @@ spec:
                   type: object
                   x-kubernetes-validations:
                   - message: RootCA cannot have both Secret and ConfigMap defined.
-                    rule: has(self.secret) && has(self.configMap)
+                    rule: '!has(self.secret) || !has(self.configMap)'
                 type: array
               rootCAsSecrets:
                 description: |-
@@ -2436,7 +2436,7 @@ spec:
                       type: object
                       x-kubernetes-validations:
                       - message: RootCA cannot have both Secret and ConfigMap defined.
-                        rule: has(self.secret) && has(self.configMap)
+                        rule: '!has(self.secret) || !has(self.configMap)'
                     type: array
                   rootCAsSecrets:
                     description: |-

integration/fixtures/simple_sanitize_path.toml

@@ -19,6 +19,9 @@
 [providers.file]
   filename = "{{ .SelfFilename }}"
 
+[core]
+  defaultRuleSyntax = "{{ .DefaultRuleSyntax }}"
+
 # dynamic configuration
 [http.routers]
   [http.routers.without]