resolving merge conflict.. manual rebasing changes

maniSbindra · maniSbindra · commit 2483c19170d8 · 2020-03-26T21:13:47.000+05:30
diff --git a/clusterloader2/testing/load/config.yaml b/clusterloader2/testing/load/config.yaml
@@ -17,12 +17,12 @@
 {{$ENABLE_CHAOSMONKEY := DefaultParam .ENABLE_CHAOSMONKEY false}}
 {{$PROMETHEUS_SCRAPE_KUBE_PROXY := DefaultParam .PROMETHEUS_SCRAPE_KUBE_PROXY true}}
 {{$ENABLE_PROMETHEUS_API_RESPONSIVENESS := DefaultParam .ENABLE_PROMETHEUS_API_RESPONSIVENESS false}}
-{{$ENABLE_CONFIGMAPS := DefaultParam .CL2_ENABLE_CONFIGMAPS false}}
-{{$ENABLE_DAEMONSETS := DefaultParam .CL2_ENABLE_DAEMONSETS false}}
-{{$ENABLE_JOBS := DefaultParam .CL2_ENABLE_JOBS false}}
-{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS false}}
-{{$ENABLE_SECRETS := DefaultParam .CL2_ENABLE_SECRETS false}}
-{{$ENABLE_STATEFULSETS := DefaultParam .CL2_ENABLE_STATEFULSETS false}}
+{{$ENABLE_CONFIGMAPS := DefaultParam .CL2_ENABLE_CONFIGMAPS true}}
+{{$ENABLE_DAEMONSETS := DefaultParam .CL2_ENABLE_DAEMONSETS true}}
+{{$ENABLE_JOBS := DefaultParam .CL2_ENABLE_JOBS true}}
+{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS true}}
+{{$ENABLE_SECRETS := DefaultParam .CL2_ENABLE_SECRETS true}}
+{{$ENABLE_STATEFULSETS := DefaultParam .CL2_ENABLE_STATEFULSETS true}}
 {{$ENABLE_NETWORKPOLICIES := DefaultParam .CL2_ENABLE_NETWORKPOLICIES false}}
 {{$ENABLE_SYSTEM_POD_METRICS:= DefaultParam .ENABLE_SYSTEM_POD_METRICS true}}
 {{$USE_SIMPLE_LATENCY_QUERY := DefaultParam .USE_SIMPLE_LATENCY_QUERY false}}
diff --git a/clusterloader2/testing/load/deployment.yaml b/clusterloader2/testing/load/deployment.yaml
@@ -1,5 +1,5 @@
-{{$EnableConfigMaps := DefaultParam .CL2_ENABLE_CONFIGMAPS false}}
-{{$EnableSecrets := DefaultParam .CL2_ENABLE_SECRETS false}}
+{{$EnableConfigMaps := DefaultParam .CL2_ENABLE_CONFIGMAPS true}}
+{{$EnableSecrets := DefaultParam .CL2_ENABLE_SECRETS true}}
 {{$CpuRequest := DefaultParam .CpuRequest "10m"}}
 {{$MemoryRequest := DefaultParam .MemoryRequest "10M"}}
 
diff --git a/clusterloader2/testing/load/experimental-config.yaml b/clusterloader2/testing/load/experimental-config.yaml
@@ -19,12 +19,12 @@
 {{$ENABLE_CHAOSMONKEY := DefaultParam .ENABLE_CHAOSMONKEY false}}
 {{$PROMETHEUS_SCRAPE_KUBE_PROXY := DefaultParam .PROMETHEUS_SCRAPE_KUBE_PROXY true}}
 {{$ENABLE_PROMETHEUS_API_RESPONSIVENESS := DefaultParam .ENABLE_PROMETHEUS_API_RESPONSIVENESS false}}
-{{$ENABLE_CONFIGMAPS := DefaultParam .CL2_ENABLE_CONFIGMAPS false}}
-{{$ENABLE_DAEMONSETS := DefaultParam .CL2_ENABLE_DAEMONSETS false}}
-{{$ENABLE_JOBS := DefaultParam .CL2_ENABLE_JOBS false}}
-{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS false}}
-{{$ENABLE_SECRETS := DefaultParam .CL2_ENABLE_SECRETS false}}
-{{$ENABLE_STATEFULSETS := DefaultParam .CL2_ENABLE_STATEFULSETS false}}
+{{$ENABLE_CONFIGMAPS := DefaultParam .CL2_ENABLE_CONFIGMAPS true}}
+{{$ENABLE_DAEMONSETS := DefaultParam .CL2_ENABLE_DAEMONSETS true}}
+{{$ENABLE_JOBS := DefaultParam .CL2_ENABLE_JOBS true}}
+{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS true}}
+{{$ENABLE_SECRETS := DefaultParam .CL2_ENABLE_SECRETS true}}
+{{$ENABLE_STATEFULSETS := DefaultParam .CL2_ENABLE_STATEFULSETS true}}
 {{$ENABLE_NETWORKPOLICIES := DefaultParam .CL2_ENABLE_NETWORKPOLICIES false}}
 {{$ENABLE_SYSTEM_POD_METRICS:= DefaultParam .ENABLE_SYSTEM_POD_METRICS true}}
 {{$USE_SIMPLE_LATENCY_QUERY := DefaultParam .USE_SIMPLE_LATENCY_QUERY false}}
diff --git a/clusterloader2/testing/load/statefulset.yaml b/clusterloader2/testing/load/statefulset.yaml
@@ -1,4 +1,4 @@
-{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS false}}
+{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS true}}
 
 apiVersion: apps/v1
 kind: StatefulSet

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS false}}`
	`1`	`+{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS true}}`
`2`	`2`
`3`	`3`	`apiVersion: apps/v1`
`4`	`4`	`kind: StatefulSet`