From b4882d0a6f740b8ba966a169a9ea2ecd12ce000e Mon Sep 17 00:00:00 2001 From: Maninderjit Bindra Date: Wed, 18 Mar 2020 14:37:59 +0530 Subject: [PATCH 1/2] Add CL2 prefix to ENABLE_PVS variable. Set Default to true --- clusterloader2/testing/load/config.yaml | 2 +- clusterloader2/testing/load/experimental-config.yaml | 2 +- clusterloader2/testing/load/statefulset.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clusterloader2/testing/load/config.yaml b/clusterloader2/testing/load/config.yaml index b6c916ef05..7e16cfd4bc 100644 --- a/clusterloader2/testing/load/config.yaml +++ b/clusterloader2/testing/load/config.yaml @@ -20,7 +20,7 @@ {{$ENABLE_CONFIGMAPS := DefaultParam .ENABLE_CONFIGMAPS false}} {{$ENABLE_DAEMONSETS := DefaultParam .ENABLE_DAEMONSETS false}} {{$ENABLE_JOBS := DefaultParam .ENABLE_JOBS false}} -{{$ENABLE_PVS := DefaultParam .ENABLE_PVS false}} +{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS true}} {{$ENABLE_SECRETS := DefaultParam .ENABLE_SECRETS false}} {{$ENABLE_STATEFULSETS := DefaultParam .ENABLE_STATEFULSETS false}} {{$ENABLE_NETWORKPOLICIES := DefaultParam .ENABLE_NETWORKPOLICIES false}} diff --git a/clusterloader2/testing/load/experimental-config.yaml b/clusterloader2/testing/load/experimental-config.yaml index c8602d4624..5ee30cce0b 100644 --- a/clusterloader2/testing/load/experimental-config.yaml +++ b/clusterloader2/testing/load/experimental-config.yaml @@ -22,7 +22,7 @@ {{$ENABLE_CONFIGMAPS := DefaultParam .ENABLE_CONFIGMAPS false}} {{$ENABLE_DAEMONSETS := DefaultParam .ENABLE_DAEMONSETS false}} {{$ENABLE_JOBS := DefaultParam .ENABLE_JOBS false}} -{{$ENABLE_PVS := DefaultParam .ENABLE_PVS false}} +{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS true}} {{$ENABLE_SECRETS := DefaultParam .ENABLE_SECRETS false}} {{$ENABLE_STATEFULSETS := DefaultParam .ENABLE_STATEFULSETS false}} {{$ENABLE_NETWORKPOLICIES := DefaultParam .ENABLE_NETWORKPOLICIES false}} diff --git a/clusterloader2/testing/load/statefulset.yaml b/clusterloader2/testing/load/statefulset.yaml index 43157b7928..b66406b8b8 100644 --- a/clusterloader2/testing/load/statefulset.yaml +++ b/clusterloader2/testing/load/statefulset.yaml @@ -1,4 +1,4 @@ -{{$EnablePVs := DefaultParam .ENABLE_PVS false}} +{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS true}} apiVersion: apps/v1 kind: StatefulSet From 2d6b74e989473267cd724783b1dc0b58270dcc1a Mon Sep 17 00:00:00 2001 From: Maninderjit Bindra Date: Wed, 18 Mar 2020 17:04:16 +0530 Subject: [PATCH 2/2] prefixing all variables under overrides with CL2_ --- clusterloader2/testing/load/config.yaml | 12 ++++++------ clusterloader2/testing/load/deployment.yaml | 4 ++-- clusterloader2/testing/load/experimental-config.yaml | 12 ++++++------ clusterloader2/testing/load/statefulset.yaml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/clusterloader2/testing/load/config.yaml b/clusterloader2/testing/load/config.yaml index 7e16cfd4bc..3226b2f7ca 100644 --- 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 .ENABLE_CONFIGMAPS false}} -{{$ENABLE_DAEMONSETS := DefaultParam .ENABLE_DAEMONSETS false}} -{{$ENABLE_JOBS := DefaultParam .ENABLE_JOBS false}} -{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS true}} -{{$ENABLE_SECRETS := DefaultParam .ENABLE_SECRETS false}} -{{$ENABLE_STATEFULSETS := DefaultParam .ENABLE_STATEFULSETS 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_NETWORKPOLICIES := DefaultParam .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 index 8a889a30d3..2ea4a431b4 100644 --- a/clusterloader2/testing/load/deployment.yaml +++ b/clusterloader2/testing/load/deployment.yaml @@ -1,5 +1,5 @@ -{{$EnableConfigMaps := DefaultParam .ENABLE_CONFIGMAPS false}} -{{$EnableSecrets := DefaultParam .ENABLE_SECRETS false}} +{{$EnableConfigMaps := DefaultParam .CL2_ENABLE_CONFIGMAPS false}} +{{$EnableSecrets := DefaultParam .CL2_ENABLE_SECRETS false}} {{$CpuRequest := DefaultParam .CpuRequest "10m"}} {{$MemoryRequest := DefaultParam .MemoryRequest "10M"}} diff --git a/clusterloader2/testing/load/experimental-config.yaml b/clusterloader2/testing/load/experimental-config.yaml index 5ee30cce0b..adb4e65845 100644 --- 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 .ENABLE_CONFIGMAPS false}} -{{$ENABLE_DAEMONSETS := DefaultParam .ENABLE_DAEMONSETS false}} -{{$ENABLE_JOBS := DefaultParam .ENABLE_JOBS false}} -{{$ENABLE_PVS := DefaultParam .CL2_ENABLE_PVS true}} -{{$ENABLE_SECRETS := DefaultParam .ENABLE_SECRETS false}} -{{$ENABLE_STATEFULSETS := DefaultParam .ENABLE_STATEFULSETS 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_NETWORKPOLICIES := DefaultParam .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 index b66406b8b8..da6b82289a 100644 --- a/clusterloader2/testing/load/statefulset.yaml +++ b/clusterloader2/testing/load/statefulset.yaml @@ -1,4 +1,4 @@ -{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS true}} +{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS false}} apiVersion: apps/v1 kind: StatefulSet