Merge branch 'v2.11' into feature/vitest-fix-unit-tests-2.11

traefik · May 21, 2024 · 996c525 · 996c525
2 parents 05babce + 4292059
commit 996c525
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/docs/content/routing/providers/kubernetes-crd.md b/docs/content/routing/providers/kubernetes-crd.md
@@ -897,15 +897,15 @@ More information in the dedicated [mirroring](../services/index.md#mirroring-ser
 
     spec:
       mirroring:
-        name: svc1
+        name: svc1                      # svc1 receives 100% of the traffic
         port: 80
         mirrors:
-          - name: svc2
+          - name: svc2                  # svc2 receives a copy of 20% of this traffic
             port: 80
             percent: 20
-          - name: svc3
+          - name: svc3                  # svc3 receives a copy of 15% of this traffic
             kind: TraefikService
-            percent: 20
+            percent: 15
     ```
 
     ```yaml tab="Mirroring Traefik Service"
@@ -918,15 +918,15 @@ More information in the dedicated [mirroring](../services/index.md#mirroring-ser
 
     spec:
       mirroring:
-        name: wrr1
+        name: wrr1                      # wrr1 receives 100% of the traffic
         kind: TraefikService
-         mirrors:
-           - name: svc2
-             port: 80
-             percent: 20
-           - name: svc3
-             kind: TraefikService
-             percent: 20
+        mirrors:
+          - name: svc2                  # svc2 receives a copy of 20% of this traffic
+            port: 80
+            percent: 20
+          - name: svc3                  # svc3 receives a copy of 10% of this traffic
+            kind: TraefikService
+            percent: 10
     ```
 
     ```yaml tab="K8s Service"

diff --git a/webui/src/components/_commons/PanelMiddlewares.vue b/webui/src/components/_commons/PanelMiddlewares.vue
@@ -809,12 +809,11 @@
                 <div class="text-subtitle2">
                   Content Security Policy
                 </div>
-                <q-chip
-                  dense
-                  class="app-chip app-chip-green"
-                >
-                  {{ exData(middleware).contentSecurityPolicy }}
-                </q-chip>
+                <q-card class="app-chip app-chip-green app-card-as-chip">
+                  <q-card-section>
+                    {{ exData(middleware).contentSecurityPolicy }}
+                  </q-card-section>
+                </q-card>
               </div>
             </div>
           </q-card-section>

diff --git a/webui/src/css/sass/app.scss b/webui/src/css/sass/app.scss
@@ -121,6 +121,14 @@ body {
   border-radius: 8px;
 }
 
+.app-card-as-chip {
+  box-shadow: none;
+
+  .q-card__section {
+    padding: 5px !important;
+  }
+}
+
 // Chips
 .app-chip {
   border-radius: 8px;