feat(eval/k8s): extract common filter conf in fluxtomizations

dettanym · Jan 7, 2025 · 43d7d45 · 43d7d45
1 parent 2d6c5cf
commit 43d7d45
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/evaluation/kubernetes/apps/samples/bookinfo/with-passthrough-filter/ks.yaml b/evaluation/kubernetes/apps/samples/bookinfo/with-passthrough-filter/ks.yaml
@@ -22,6 +22,9 @@ extra:
       - name: cluster-apps-istio-system-istiod
     path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
 
+  baseFilterVars: &baseFilterVars
+    filter_name: *filterName
+
 items:
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -48,7 +51,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: details
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -59,7 +62,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: ratings
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -70,7 +73,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: reviews
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -81,5 +84,5 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: productpage
diff --git a/evaluation/kubernetes/apps/samples/bookinfo/with-prose-filter/ks.yaml b/evaluation/kubernetes/apps/samples/bookinfo/with-prose-filter/ks.yaml
@@ -22,6 +22,9 @@ extra:
       - name: cluster-apps-istio-system-istiod
     path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
 
+  baseFilterVars: &baseFilterVars
+    filter_name: *filterName
+
 items:
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -48,7 +51,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: details
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -59,7 +62,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: ratings
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -70,7 +73,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: reviews
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -81,5 +84,5 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: productpage
diff --git a/evaluation/kubernetes/apps/samples/bookinfo/with-prose-no-presidio-filter/ks.yaml b/evaluation/kubernetes/apps/samples/bookinfo/with-prose-no-presidio-filter/ks.yaml
@@ -22,6 +22,9 @@ extra:
       - name: cluster-apps-istio-system-istiod
     path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
 
+  baseFilterVars: &baseFilterVars
+    filter_name: *filterName
+
 items:
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -48,7 +51,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: details
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -59,7 +62,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: ratings
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -70,7 +73,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: reviews
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -81,5 +84,5 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: productpage
diff --git a/evaluation/kubernetes/apps/samples/bookinfo/with-tooling-filter/ks.yaml b/evaluation/kubernetes/apps/samples/bookinfo/with-tooling-filter/ks.yaml
@@ -22,6 +22,9 @@ extra:
       - name: cluster-apps-istio-system-istiod
     path: ./evaluation/kubernetes/apps/samples/bookinfo/_template/filter
 
+  baseFilterVars: &baseFilterVars
+    filter_name: *filterName
+
 items:
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -48,7 +51,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: details
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -59,7 +62,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: ratings
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -70,7 +73,7 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: reviews
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
@@ -81,5 +84,5 @@ items:
       <<: *filterSpec
       postBuild:
         substitute:
-          filter_name: *filterName
+          <<: *baseFilterVars
           app: productpage