Merge pull request #3779 from serathius/module-refactor

Move all load manifests under the related modules

Author: k8s-ci-robot

clusterloader2/testing/huge-service/service.yaml

@@ -1 +1 @@
-../load/service.yaml
+../load/modules/services/service.yaml

clusterloader2/testing/huge-service/simple-deployment.yaml

@@ -1 +1 @@
-../load/simple-deployment.yaml
+../load/modules/scheduler-throughput/simple-deployment.yaml

clusterloader2/testing/load/config.yaml

@@ -151,7 +151,7 @@ steps:
 {{end}}
 
 - module:
-    path: modules/services.yaml
+    path: modules/services/config.yaml
     params:
       actionName: "Creating"
       namespaces: {{$namespaces}}
@@ -170,7 +170,7 @@ steps:
 # Moved from reconcile-objects/config.yaml to mitigate https://github.com/kubernetes/kubernetes/issues/96635.
 # TODO(https://github.com/kubernetes/perf-tests/issues/1823): Merge back to reconcile-objects/config.yaml once the k/k bug is fixed.
 - module:
-    path: /modules/configmaps-secrets.yaml
+    path: /modules/configmaps-secrets/config.yaml
     params:
       actionName: create
       tuningSet: default
@@ -232,7 +232,7 @@ steps:
 {{if not $IS_SMALL_CLUSTER}}
 # BEGIN scheduler throughput
 - module:
-    path: modules/scheduler-throughput.yaml
+    path: modules/scheduler-throughput/config.yaml
     params:
       action: create
       namespaces: {{$namespaces}}
@@ -288,7 +288,7 @@ steps:
 
 {{if not $IS_SMALL_CLUSTER}}
 - module:
-    path: modules/scheduler-throughput.yaml
+    path: modules/scheduler-throughput/config.yaml
     params:
       action: delete
       namespaces: {{$namespaces}}
@@ -421,7 +421,7 @@ steps:
 {{end}}
 
 - module:
-    path: /modules/configmaps-secrets.yaml
+    path: /modules/configmaps-secrets/config.yaml
     params:
       actionName: delete
       tuningSet: default
@@ -439,7 +439,7 @@ steps:
           objectTemplatePath: daemonset-priorityclass.yaml
 
 - module:
-    path: modules/services.yaml
+    path: /modules/services/config.yaml
     params:
       actionName: "Deleting"
       namespaces: {{$namespaces}}

…ing/load/modules/configmaps-secrets.yaml …d/modules/configmaps-secrets/config.yamlclusterloader2/testing/load/modules/configmaps-secrets.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/config.yaml clusterloader2/testing/load/modules/configmaps-secrets.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/config.yaml

@@ -20,26 +20,26 @@ steps:
     tuningSet: {{$tuningSet}}
     objectBundle:
     - basename: big-deployment
-      objectTemplatePath: configmap.yaml
+      objectTemplatePath: /modules/configmaps-secrets/configmap.yaml
     - basename: big-deployment
-      objectTemplatePath: secret.yaml
+      objectTemplatePath: /modules/configmaps-secrets/secret.yaml
   - namespaceRange:
       min: 1
       max: {{$namespaces}}
     replicasPerNamespace: {{$mediumDeploymentsPerNamespace}}
     tuningSet: {{$tuningSet}}
     objectBundle:
     - basename: medium-deployment
-      objectTemplatePath: configmap.yaml
+      objectTemplatePath: /modules/configmaps-secrets/configmap.yaml
     - basename: medium-deployment
-      objectTemplatePath: secret.yaml
+      objectTemplatePath: /modules/configmaps-secrets/secret.yaml
   - namespaceRange:
       min: 1
       max: {{$namespaces}}
     replicasPerNamespace: {{$smallDeploymentsPerNamespace}}
     tuningSet: {{$tuningSet}}
     objectBundle:
     - basename: small-deployment
-      objectTemplatePath: configmap.yaml
+      objectTemplatePath: /modules/configmaps-secrets/configmap.yaml
     - basename: small-deployment
-      objectTemplatePath: secret.yaml
+      objectTemplatePath: /modules/configmaps-secrets/secret.yaml

…usterloader2/testing/load/configmap.yaml …odules/configmaps-secrets/configmap.yamlclusterloader2/testing/load/configmap.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/configmap.yaml clusterloader2/testing/load/configmap.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/configmap.yaml

@@ -48,7 +48,7 @@ steps:
       tuningSet: Uniform5qps
       objectBundle:
         - basename: latency-deployment
-          objectTemplatePath: simple-deployment.yaml
+          objectTemplatePath: /modules/scheduler-throughput/simple-deployment.yaml
           templateFillMap:
             Replicas: 1
             Group: latency
@@ -70,7 +70,7 @@ steps:
       tuningSet: default
       objectBundle:
         - basename: latency-deployment
-          objectTemplatePath: simple-deployment.yaml
+          objectTemplatePath: /modules/scheduler-throughput/simple-deployment.yaml
 - name: Waiting for latency pods to be deleted
   measurements:
     - Identifier: WaitForRunningLatencyDeployments

clusterloader2/testing/load/secret.yaml …d/modules/configmaps-secrets/secret.yamlclusterloader2/testing/load/secret.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/secret.yaml clusterloader2/testing/load/secret.yaml renamed to clusterloader2/testing/load/modules/configmaps-secrets/secret.yaml

@@ -53,7 +53,7 @@ steps:
     tuningSet: default
     objectBundle:
     - basename: scheduler-throughput-deployment
-      objectTemplatePath: simple-deployment.yaml
+      objectTemplatePath: /modules/scheduler-throughput/simple-deployment.yaml
       templateFillMap:
         Replicas: {{$schedulerThroughputPodsPerDeployment}}
         Group: scheduler-throughput

clusterloader2/testing/load/modules/pod-startup-latency.yaml

@@ -17,20 +17,20 @@ steps:
     tuningSet: Sequence
     objectBundle:
     - basename: big-service
-      objectTemplatePath: service.yaml
+      objectTemplatePath: /modules/services/service.yaml
   - namespaceRange:
       min: 1
       max: {{$namespaces}}
     replicasPerNamespace: {{$mediumServicesPerNamespace}}
     tuningSet: Sequence
     objectBundle:
     - basename: medium-service
-      objectTemplatePath: service.yaml
+      objectTemplatePath: /modules/services/service.yaml
   - namespaceRange:
       min: 1
       max: {{$namespaces}}
     replicasPerNamespace: {{$smallServicesPerNamespace}}
     tuningSet: Sequence
     objectBundle:
     - basename: small-service
-      objectTemplatePath: service.yaml
+      objectTemplatePath: /modules/services/service.yaml