feat(k8s/samples): rename sample deployments consistently

Also renamed ingress resources, so they now match fluxtomization and namespace names.
dettanym · Apr 28, 2024 · fabb85b · fabb85b
1 parent 4649cef
commit fabb85b
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 70 deletions.
diff --git a/evaluation/kubernetes/apps/samples/bookinfo/kustomization.yaml b/evaluation/kubernetes/apps/samples/bookinfo/kustomization.yaml
@@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./plain
-  - ./with-envoy
-  - ./with-filter
-  - ./with-filter-passthrough
-  - ./with-filter-traces-opa-singleton
+  - ./with-istio
+  - ./with-passthrough-filter
+  - ./with-prose-filter
+  - ./with-tooling-filter
diff --git a/evaluation/kubernetes/apps/samples/bookinfo/plain/ks.yaml b/evaluation/kubernetes/apps/samples/bookinfo/plain/ks.yaml
@@ -2,16 +2,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-plain
+  name: &name bookinfo-plain
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/app
-  targetNamespace: bookinfo-plain
+  targetNamespace: *name
   postBuild:
     substitute:
-      ingress_name: bookinfo-plain
+      ingress_name: *name
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/.../apps/samples/bookinfo/with-envoy/ks.yaml → .../apps/samples/bookinfo/with-istio/ks.yaml b/.../apps/samples/bookinfo/with-envoy/ks.yaml → .../apps/samples/bookinfo/with-istio/ks.yaml
@@ -2,16 +2,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-with-envoy
+  name: &name bookinfo-with-istio
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/app
-  targetNamespace: bookinfo-with-envoy
+  targetNamespace: *name
   postBuild:
     substitute:
-      ingress_name: bookinfo-envoy
+      ingress_name: *name
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/...es/bookinfo/with-envoy/kustomization.yaml → ...es/bookinfo/with-istio/kustomization.yaml b/...es/bookinfo/with-envoy/kustomization.yaml → ...es/bookinfo/with-istio/kustomization.yaml
diff --git a/...amples/bookinfo/with-envoy/namespace.yaml → ...amples/bookinfo/with-istio/namespace.yaml b/...amples/bookinfo/with-envoy/namespace.yaml → ...amples/bookinfo/with-istio/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: bookinfo-with-envoy
+  name: bookinfo-with-istio
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
     istio-injection: enabled
diff --git a/.../bookinfo/with-filter-passthrough/ks.yaml → .../bookinfo/with-passthrough-filter/ks.yaml b/.../bookinfo/with-filter-passthrough/ks.yaml → .../bookinfo/with-passthrough-filter/ks.yaml
@@ -2,13 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-passthrough-details
+  name: bookinfo-envoy-passthrough-filter-details
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-passthrough
+  targetNamespace: bookinfo-with-passthrough-filter
   postBuild:
     substitute:
       filter_name: passthrough
@@ -25,13 +25,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-passthrough-ratings
+  name: bookinfo-envoy-passthrough-filter-ratings
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-passthrough
+  targetNamespace: bookinfo-with-passthrough-filter
   postBuild:
     substitute:
       filter_name: passthrough
@@ -48,13 +48,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-passthrough-reviews
+  name: bookinfo-envoy-passthrough-filter-reviews
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-passthrough
+  targetNamespace: bookinfo-with-passthrough-filter
   postBuild:
     substitute:
       filter_name: passthrough
@@ -71,13 +71,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-passthrough-productpage
+  name: bookinfo-envoy-passthrough-filter-productpage
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-passthrough
+  targetNamespace: bookinfo-with-passthrough-filter
   postBuild:
     substitute:
       filter_name: passthrough
@@ -94,19 +94,19 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-with-filter-passthrough
+  name: &name bookinfo-with-passthrough-filter
   namespace: flux-system
 spec:
   dependsOn:
-    - name: bookinfo-envoy-filter-passthrough-details
-    - name: bookinfo-envoy-filter-passthrough-ratings
-    - name: bookinfo-envoy-filter-passthrough-reviews
-    - name: bookinfo-envoy-filter-passthrough-productpage
+    - name: bookinfo-envoy-passthrough-filter-details
+    - name: bookinfo-envoy-passthrough-filter-ratings
+    - name: bookinfo-envoy-passthrough-filter-reviews
+    - name: bookinfo-envoy-passthrough-filter-productpage
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/app
-  targetNamespace: bookinfo-with-filter-passthrough
+  targetNamespace: *name
   postBuild:
     substitute:
-      ingress_name: bookinfo-filter-passthrough
+      ingress_name: *name
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/...ith-filter-passthrough/kustomization.yaml → ...ith-passthrough-filter/kustomization.yaml b/...ith-filter-passthrough/kustomization.yaml → ...ith-passthrough-filter/kustomization.yaml
diff --git a/...fo/with-filter-passthrough/namespace.yaml → ...fo/with-passthrough-filter/namespace.yaml b/...fo/with-filter-passthrough/namespace.yaml → ...fo/with-passthrough-filter/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: bookinfo-with-filter-passthrough
+  name: bookinfo-with-passthrough-filter
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
     istio-injection: enabled
diff --git a/...apps/samples/bookinfo/with-filter/ks.yaml → ...amples/bookinfo/with-prose-filter/ks.yaml b/...apps/samples/bookinfo/with-filter/ks.yaml → ...amples/bookinfo/with-prose-filter/ks.yaml
@@ -2,13 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-details
+  name: bookinfo-envoy-prose-filter-details
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter
+  targetNamespace: bookinfo-with-prose-filter
   postBuild:
     substitute:
       filter_name: simple
@@ -25,13 +25,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-ratings
+  name: bookinfo-envoy-prose-filter-ratings
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter
+  targetNamespace: bookinfo-with-prose-filter
   postBuild:
     substitute:
       filter_name: simple
@@ -48,13 +48,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-reviews
+  name: bookinfo-envoy-prose-filter-reviews
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter
+  targetNamespace: bookinfo-with-prose-filter
   postBuild:
     substitute:
       filter_name: simple
@@ -71,13 +71,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-productpage
+  name: bookinfo-envoy-prose-filter-productpage
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter
+  targetNamespace: bookinfo-with-prose-filter
   postBuild:
     substitute:
       filter_name: simple
@@ -94,19 +94,19 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-with-filter
+  name: bookinfo-with-prose-filter
   namespace: flux-system
 spec:
   dependsOn:
-    - name: bookinfo-envoy-filter-details
-    - name: bookinfo-envoy-filter-ratings
-    - name: bookinfo-envoy-filter-reviews
-    - name: bookinfo-envoy-filter-productpage
+    - name: bookinfo-envoy-prose-filter-details
+    - name: bookinfo-envoy-prose-filter-ratings
+    - name: bookinfo-envoy-prose-filter-reviews
+    - name: bookinfo-envoy-prose-filter-productpage
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/app
-  targetNamespace: bookinfo-with-filter
+  targetNamespace: bookinfo-with-prose-filter
   postBuild:
     substitute:
-      ingress_name: bookinfo-filter
+      ingress_name: bookinfo-with-prose-filter
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/...r-traces-opa-singleton/kustomization.yaml → ...info/with-prose-filter/kustomization.yaml b/...r-traces-opa-singleton/kustomization.yaml → ...info/with-prose-filter/kustomization.yaml
diff --git a/...mples/bookinfo/with-filter/namespace.yaml → ...bookinfo/with-prose-filter/namespace.yaml b/...mples/bookinfo/with-filter/namespace.yaml → ...bookinfo/with-prose-filter/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: bookinfo-with-filter
+  name: bookinfo-with-prose-filter
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
     istio-injection: enabled
diff --git a/.../with-filter-traces-opa-singleton/ks.yaml → ...ples/bookinfo/with-tooling-filter/ks.yaml b/.../with-filter-traces-opa-singleton/ks.yaml → ...ples/bookinfo/with-tooling-filter/ks.yaml
@@ -2,13 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-traces-opa-singleton-details
+  name: bookinfo-envoy-tooling-filter-details
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-traces-opa-singleton
+  targetNamespace: bookinfo-with-tooling-filter
   postBuild:
     substitute:
       filter_name: traces-opa-singleton
@@ -25,13 +25,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-traces-opa-singleton-ratings
+  name: bookinfo-envoy-tooling-filter-ratings
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-traces-opa-singleton
+  targetNamespace: bookinfo-with-tooling-filter
   postBuild:
     substitute:
       filter_name: traces-opa-singleton
@@ -48,13 +48,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-traces-opa-singleton-reviews
+  name: bookinfo-envoy-tooling-filter-reviews
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-traces-opa-singleton
+  targetNamespace: bookinfo-with-tooling-filter
   postBuild:
     substitute:
       filter_name: traces-opa-singleton
@@ -71,13 +71,13 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-envoy-filter-traces-opa-singleton-productpage
+  name: bookinfo-envoy-tooling-filter-productpage
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-istio-system-istiod
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
-  targetNamespace: bookinfo-with-filter-traces-opa-singleton
+  targetNamespace: bookinfo-with-tooling-filter
   postBuild:
     substitute:
       filter_name: traces-opa-singleton
@@ -94,19 +94,19 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: bookinfo-with-filter-traces-opa-singleton
+  name: bookinfo-with-tooling-filter
   namespace: flux-system
 spec:
   dependsOn:
-    - name: bookinfo-envoy-filter-traces-opa-singleton-details
-    - name: bookinfo-envoy-filter-traces-opa-singleton-ratings
-    - name: bookinfo-envoy-filter-traces-opa-singleton-reviews
-    - name: bookinfo-envoy-filter-traces-opa-singleton-productpage
+    - name: bookinfo-envoy-tooling-filter-details
+    - name: bookinfo-envoy-tooling-filter-ratings
+    - name: bookinfo-envoy-tooling-filter-reviews
+    - name: bookinfo-envoy-tooling-filter-productpage
   path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/app
-  targetNamespace: bookinfo-with-filter-traces-opa-singleton
+  targetNamespace: bookinfo-with-tooling-filter
   postBuild:
     substitute:
-      ingress_name: bookinfo-filter-traces-opa-singleton
+      ingress_name: bookinfo-with-tooling-filter
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/...s/bookinfo/with-filter/kustomization.yaml → ...fo/with-tooling-filter/kustomization.yaml b/...s/bookinfo/with-filter/kustomization.yaml → ...fo/with-tooling-filter/kustomization.yaml
diff --git a/...ilter-traces-opa-singleton/namespace.yaml → ...okinfo/with-tooling-filter/namespace.yaml b/...ilter-traces-opa-singleton/namespace.yaml → ...okinfo/with-tooling-filter/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: bookinfo-with-filter-traces-opa-singleton
+  name: bookinfo-with-tooling-filter
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
     istio-injection: enabled