Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CL2 prefix to ENABLE_PVS variable, to allow value to be overriden using env variable #1126

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions clusterloader2/testing/load/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 .ENABLE_PVS false}}
{{$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}}
Expand Down
4 changes: 2 additions & 2 deletions clusterloader2/testing/load/deployment.yaml
Original file line number Diff line number Diff line change
@@ -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"}}

Expand Down
12 changes: 6 additions & 6 deletions clusterloader2/testing/load/experimental-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 .ENABLE_PVS false}}
{{$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}}
Expand Down
2 changes: 1 addition & 1 deletion clusterloader2/testing/load/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{$EnablePVs := DefaultParam .ENABLE_PVS false}}
{{$EnablePVs := DefaultParam .CL2_ENABLE_PVS false}}

apiVersion: apps/v1
kind: StatefulSet
Expand Down