Merge branch 'rewrite-examples-using-meshservice' of https://github.c…

…om/slonka/kuma-website into rewrite-examples-using-meshservice

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>

# Conflicts:
#	app/_src/policies/meshcircuitbreaker.md

app/_src/policies/meshcircuitbreaker.md

@@ -466,7 +466,7 @@ spec:
   targetRef:
     kind: MeshSubset
     tags:
-      kuma.io/service: web
+      app: web
   to:
     - targetRef:
         kind: MeshService
@@ -492,9 +492,9 @@ name: backend-inbound-outlier-detection
 mesh: default
 spec:
   targetRef:
-    kind: MeshService
-    name_uni: web
-    name_kube: web_kuma-demo_svc_8080
+    kind: MeshSubset
+    tags:
+      app: web
   from:
     - targetRef:
         kind: Mesh

app/_src/policies/meshtcproute.md

@@ -112,9 +112,8 @@ mesh: default
 spec:
   targetRef:
     kind: MeshSubset
-    name: frontend
-    namespace: kuma-demo
-    sectionName: http
+    tags:
+      app: frontend
   to:
     - targetRef:
         kind: MeshService

app/_src/policies/meshtimeout.md

@@ -226,9 +226,9 @@ name: inbound-timeout
 mesh: default
 spec:
   targetRef:
-    kind: MeshService
-    name_uni: frontend
-    name_kube: frontend_kuma-demo_svc_8080
+    kind: MeshSubset
+    tags:
+      app: frontend
   from:
     - targetRef:
         kind: Mesh
@@ -274,9 +274,9 @@ name: route-to-backend-v2
 mesh: default
 spec:
   targetRef:
-    kind: MeshService
-    name_uni: frontend
-    name_kube: frontend_kuma-demo_svc_8080
+    kind: MeshSubset
+    tags:
+      app: frontend
   to:
     - targetRef:
         kind: MeshService

spec/fixtures/mt-with-from-and-meshservice-in-to.golden.html

@@ -52,13 +52,14 @@
 <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshTimeout</span>
 <span class="na">metadata</span><span class="pi">:</span>
   <span class="na">name</span><span class="pi">:</span> <span class="s">inbound-timeout</span>
-  <span class="na">namespace</span><span class="pi">:</span>
+  <span class="na">namespace</span><span class="pi">:</span> <span class="s">kuma-demo</span>
   <span class="na">labels</span><span class="pi">:</span>
     <span class="na">kuma.io/mesh</span><span class="pi">:</span> <span class="s">default</span>
 <span class="na">spec</span><span class="pi">:</span>
   <span class="na">targetRef</span><span class="pi">:</span>
-    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshService</span>
-    <span class="na">name</span><span class="pi">:</span> <span class="s">frontend_kuma-demo_svc_8080</span>
+    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshSubset</span>
+    <span class="na">tags</span><span class="pi">:</span>
+      <span class="na">app</span><span class="pi">:</span> <span class="s">frontend</span>
   <span class="na">from</span><span class="pi">:</span>
   <span class="pi">-</span> <span class="na">targetRef</span><span class="pi">:</span>
       <span class="na">kind</span><span class="pi">:</span> <span class="s">Mesh</span>
@@ -76,13 +77,14 @@
 <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshTimeout</span>
 <span class="na">metadata</span><span class="pi">:</span>
   <span class="na">name</span><span class="pi">:</span> <span class="s">inbound-timeout</span>
-  <span class="na">namespace</span><span class="pi">:</span>
+  <span class="na">namespace</span><span class="pi">:</span> <span class="s">kuma-demo</span>
   <span class="na">labels</span><span class="pi">:</span>
     <span class="na">kuma.io/mesh</span><span class="pi">:</span> <span class="s">default</span>
 <span class="na">spec</span><span class="pi">:</span>
   <span class="na">targetRef</span><span class="pi">:</span>
-    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshService</span>
-    <span class="na">name</span><span class="pi">:</span> <span class="s">frontend_kuma-demo_svc_8080</span>
+    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshSubset</span>
+    <span class="na">tags</span><span class="pi">:</span>
+      <span class="na">app</span><span class="pi">:</span> <span class="s">frontend</span>
   <span class="na">from</span><span class="pi">:</span>
   <span class="pi">-</span> <span class="na">targetRef</span><span class="pi">:</span>
       <span class="na">kind</span><span class="pi">:</span> <span class="s">Mesh</span>
@@ -118,8 +120,9 @@
 <span class="na">mesh</span><span class="pi">:</span> <span class="s">default</span>
 <span class="na">spec</span><span class="pi">:</span>
   <span class="na">targetRef</span><span class="pi">:</span>
-    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshService</span>
-    <span class="na">name</span><span class="pi">:</span> <span class="s">frontend</span>
+    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshSubset</span>
+    <span class="na">tags</span><span class="pi">:</span>
+      <span class="na">app</span><span class="pi">:</span> <span class="s">frontend</span>
   <span class="na">from</span><span class="pi">:</span>
   <span class="pi">-</span> <span class="na">targetRef</span><span class="pi">:</span>
       <span class="na">kind</span><span class="pi">:</span> <span class="s">Mesh</span>
@@ -138,8 +141,9 @@
 <span class="na">mesh</span><span class="pi">:</span> <span class="s">default</span>
 <span class="na">spec</span><span class="pi">:</span>
   <span class="na">targetRef</span><span class="pi">:</span>
-    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshService</span>
-    <span class="na">name</span><span class="pi">:</span> <span class="s">frontend</span>
+    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshSubset</span>
+    <span class="na">tags</span><span class="pi">:</span>
+      <span class="na">app</span><span class="pi">:</span> <span class="s">frontend</span>
   <span class="na">from</span><span class="pi">:</span>
   <span class="pi">-</span> <span class="na">targetRef</span><span class="pi">:</span>
       <span class="na">kind</span><span class="pi">:</span> <span class="s">Mesh</span>

spec/fixtures/mt-with-from-and-meshservice-in-to.yaml

@@ -3,9 +3,9 @@ name: inbound-timeout
 mesh: default
 spec:
   targetRef:
-    kind: MeshService
-    name_uni: frontend
-    name_kube: frontend_kuma-demo_svc_8080
+    kind: MeshSubset
+    tags:
+      app: frontend
   from:
     - targetRef:
         kind: Mesh

spec/fixtures/mt-with-from-and-to.golden.html

@@ -48,13 +48,14 @@
 <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshTimeout</span>
 <span class="na">metadata</span><span class="pi">:</span>
   <span class="na">name</span><span class="pi">:</span> <span class="s">inbound-timeout</span>
-  <span class="na">namespace</span><span class="pi">:</span>
+  <span class="na">namespace</span><span class="pi">:</span> <span class="s">kuma-demo</span>
   <span class="na">labels</span><span class="pi">:</span>
     <span class="na">kuma.io/mesh</span><span class="pi">:</span> <span class="s">default</span>
 <span class="na">spec</span><span class="pi">:</span>
   <span class="na">targetRef</span><span class="pi">:</span>
-    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshService</span>
-    <span class="na">name</span><span class="pi">:</span> <span class="s">frontend_kuma-demo_svc_8080</span>
+    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshSubset</span>
+    <span class="na">tags</span><span class="pi">:</span>
+      <span class="na">app</span><span class="pi">:</span> <span class="s">frontend</span>
   <span class="na">from</span><span class="pi">:</span>
   <span class="pi">-</span> <span class="na">targetRef</span><span class="pi">:</span>
       <span class="na">kind</span><span class="pi">:</span> <span class="s">Mesh</span>
@@ -83,8 +84,9 @@
 <span class="na">mesh</span><span class="pi">:</span> <span class="s">default</span>
 <span class="na">spec</span><span class="pi">:</span>
   <span class="na">targetRef</span><span class="pi">:</span>
-    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshService</span>
-    <span class="na">name</span><span class="pi">:</span> <span class="s">frontend</span>
+    <span class="na">kind</span><span class="pi">:</span> <span class="s">MeshSubset</span>
+    <span class="na">tags</span><span class="pi">:</span>
+      <span class="na">app</span><span class="pi">:</span> <span class="s">frontend</span>
   <span class="na">from</span><span class="pi">:</span>
   <span class="pi">-</span> <span class="na">targetRef</span><span class="pi">:</span>
       <span class="na">kind</span><span class="pi">:</span> <span class="s">Mesh</span>

spec/fixtures/mt-with-from-and-to.yaml

@@ -3,9 +3,9 @@ name: inbound-timeout
 mesh: default
 spec:
   targetRef:
-    kind: MeshService
-    name_uni: frontend
-    name_kube: frontend_kuma-demo_svc_8080
+    kind: MeshSubset
+    tags:
+      app: frontend
   from:
     - targetRef:
         kind: Mesh

spec/kuma_plugins/liquid/tags/policy_yaml_spec.rb

@@ -11,7 +11,7 @@
 
 
   # Set up the Jekyll site and context for testing
-  let(:site) { Jekyll::Site.new(Jekyll.configuration) }
+  let(:site) { Jekyll::Site.new(Jekyll.configuration({mesh_namespace: "kuma-demo"})) }
   let(:page) { { 'version' => '2.9.1' } }  # This sets the version key for testing
   let(:registers) { { :page => page, :site => site } }
   let(:context) { Liquid::Context.new({}, {}, registers) }