feat(kumactl): update embedded demo resources (#11745)

Signed-off-by: Mike Beaumont <[email protected]>
kumahq · Oct 9, 2024 · 6eb810c · 6eb810c
1 parent 7129c94
commit 6eb810c
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 38 deletions.
diff --git a/app/kumactl/cmd/install/testdata/install-demo.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-demo.defaults.golden.yaml
@@ -12,6 +12,8 @@ kind: Service
 metadata:
   name: redis
   namespace: kuma-demo
+  labels:
+    app: redis
 spec:
   selector:
     app: redis
@@ -24,6 +26,8 @@ kind: Service
 metadata:
   name: demo-app
   namespace: kuma-demo
+  labels:
+    app: demo-app
 spec:
   selector:
     app: demo-app
@@ -130,14 +134,14 @@ spec:
     kind: MeshGateway
     name: demo-app
   to:
-    - targetRef:
-        kind: Mesh
-      rules:
-        - matches:
-            - path:
-                type: PathPrefix
-                value: "/"
-          default:
-            backendRefs:
-              - kind: MeshService
-                name: demo-app_kuma-demo_svc_5000
+  - targetRef:
+      kind: Mesh
+    rules:
+    - default:
+        backendRefs:
+        - kind: MeshService
+          name: demo-app_kuma-demo_svc_5000
+      matches:
+      - path:
+          type: PathPrefix
+          value: /
diff --git a/app/kumactl/cmd/install/testdata/install-demo.overrides.golden.yaml b/app/kumactl/cmd/install/testdata/install-demo.overrides.golden.yaml
@@ -12,6 +12,8 @@ kind: Service
 metadata:
   name: redis
   namespace: not-kuma-demo
+  labels:
+    app: redis
 spec:
   selector:
     app: redis
@@ -24,6 +26,8 @@ kind: Service
 metadata:
   name: demo-app
   namespace: not-kuma-demo
+  labels:
+    app: demo-app
 spec:
   selector:
     app: demo-app
@@ -106,7 +110,7 @@ spec:
       protocol: HTTP
   selectors:
   - match:
-      kuma.io/service: demo-app-gateway_kuma-demo_svc
+      kuma.io/service: demo-app-gateway_not-kuma-demo_svc
 ---
 apiVersion: kuma.io/v1alpha1
 kind: MeshGatewayInstance
@@ -130,14 +134,14 @@ spec:
     kind: MeshGateway
     name: demo-app
   to:
-    - targetRef:
-        kind: Mesh
-      rules:
-        - matches:
-            - path:
-                type: PathPrefix
-                value: "/"
-          default:
-            backendRefs:
-              - kind: MeshService
-                name: demo-app_not-kuma-demo_svc_5000
+  - targetRef:
+      kind: Mesh
+    rules:
+    - default:
+        backendRefs:
+        - kind: MeshService
+          name: demo-app_not-kuma-demo_svc_5000
+      matches:
+      - path:
+          type: PathPrefix
+          value: /
diff --git a/app/kumactl/cmd/install/testdata/install-demo.without-gateway.golden.yaml b/app/kumactl/cmd/install/testdata/install-demo.without-gateway.golden.yaml
@@ -12,6 +12,8 @@ kind: Service
 metadata:
   name: redis
   namespace: kuma-demo
+  labels:
+    app: redis
 spec:
   selector:
     app: redis
@@ -24,6 +26,8 @@ kind: Service
 metadata:
   name: demo-app
   namespace: kuma-demo
+  labels:
+    app: demo-app
 spec:
   selector:
     app: demo-app

diff --git a/app/kumactl/data/install/k8s/demo/demo.yaml b/app/kumactl/data/install/k8s/demo/demo.yaml
@@ -39,6 +39,8 @@ kind: Service
 metadata:
   name: redis
   namespace: {{ .Namespace }}
+  labels:
+    app: redis
 spec:
   selector:
     app: redis
@@ -82,6 +84,8 @@ kind: Service
 metadata:
   name: demo-app
   namespace: {{ .Namespace }}
+  labels:
+    app: demo-app
 spec:
   selector:
     app: demo-app

diff --git a/app/kumactl/data/install/k8s/demo/gateway.yaml b/app/kumactl/data/install/k8s/demo/gateway.yaml
@@ -13,7 +13,7 @@ spec:
       protocol: HTTP
   selectors:
   - match:
-      kuma.io/service: demo-app-gateway_kuma-demo_svc
+      kuma.io/service: demo-app-gateway_{{ .Namespace }}_svc
 ---
 apiVersion: kuma.io/v1alpha1
 kind: MeshHTTPRoute
@@ -28,17 +28,17 @@ spec:
     kind: MeshGateway
     name: demo-app
   to:
-    - targetRef:
-        kind: Mesh
-      rules:
-        - matches:
-            - path:
-                type: PathPrefix
-                value: "/"
-          default:
-            backendRefs:
-              - kind: MeshService
-                name: demo-app_{{ .Namespace }}_svc_5000
+  - targetRef:
+      kind: Mesh
+    rules:
+    - default:
+        backendRefs:
+        - kind: MeshService
+          name: demo-app_{{ .Namespace }}_svc_5000
+      matches:
+      - path:
+          type: PathPrefix
+          value: /
 ---
 apiVersion: kuma.io/v1alpha1
 kind: MeshGatewayInstance

diff --git a/mk/dependencies/deps.lock b/mk/dependencies/deps.lock
@@ -1 +1 @@
-67e5a6e147d569852851535e91196922ade8162d
+85edd35bf66665ac4e9f4fd54fdd06d202a510c3
diff --git a/mk/dev.mk b/mk/dev.mk
@@ -130,10 +130,12 @@ dev/sync-demo:
 	rm app/kumactl/data/install/k8s/demo/*.yaml
 	curl -s --fail https://raw.githubusercontent.com/kumahq/kuma-counter-demo/master/demo.yaml | \
 		sed 's/"local"/"{{ .Zone }}"/g' | \
-		sed 's/\([^/]\)kuma-demo/\1{{ .Namespace }}/g' \
+		sed 's/\([^/]\)kuma-demo/\1{{ .Namespace }}/g' | \
+		sed 's/\([^/]\)kuma-system/\1{{ .SystemNamespace }}/g' \
 		> app/kumactl/data/install/k8s/demo/demo.yaml
 	curl -s --fail https://raw.githubusercontent.com/kumahq/kuma-counter-demo/master/gateway.yaml | \
-		sed 's/\([^/]\)kuma-demo/\1{{ .Namespace }}/g' \
+		sed 's/\([^/]\)kuma-demo/\1{{ .Namespace }}/g' | \
+		sed 's/\([^/]\)kuma-system/\1{{ .SystemNamespace }}/g' \
 		> app/kumactl/data/install/k8s/demo/gateway.yaml
 
 .PHONY: dev/set-kuma-helm-repo
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		67e5a6e147d569852851535e91196922ade8162d
		85edd35bf66665ac4e9f4fd54fdd06d202a510c3