File tree Expand file tree Collapse file tree 3 files changed +8
-1
lines changed
manifests/01-admission-control
node-pools/master-default Expand file tree Collapse file tree 3 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -492,6 +492,11 @@ teapot_admission_controller_max_ephemeral_storage_request: "5Gi"
492
492
teapot_admission_controller_application_min_creation_time : " 2019-06-03T12:00:00Z"
493
493
teapot_admission_controller_ndots : " 2"
494
494
teapot_admission_controller_inject_environment_variables : " true"
495
+ {{ if eq .Cluster.Environment "test" }}
496
+ teapot_admission_controller_inject_node_options_environment_variable : " true"
497
+ {{ else }}
498
+ teapot_admission_controller_inject_node_options_environment_variable : " false"
499
+ {{ end }}
495
500
teapot_admission_controller_deployment_default_max_surge : " 5%"
496
501
teapot_admission_controller_deployment_default_max_unavailable : " 1"
497
502
teapot_admission_controller_inject_aws_waiter : " true"
Original file line number Diff line number Diff line change 50
50
pod.env-inject.variable.LOG4J_FORMAT_MSG_NO_LOOKUPS : " true"
51
51
{{- end}}
52
52
53
+ pod.env-inject.node-options.enable : " {{ .Cluster.ConfigItems.teapot_admission_controller_inject_node_options_environment_variable }}"
54
+
53
55
podfactory.container-resource-check.enable : " {{ .Cluster.ConfigItems.teapot_admission_controller_validate_pod_template_resources }}"
54
56
podfactory.application-label-check.enable : " {{ .Cluster.ConfigItems.teapot_admission_controller_validate_application_label }}"
55
57
podfactory.application-label-check.minimum-creation-time : " {{ .Cluster.ConfigItems.teapot_admission_controller_application_min_creation_time }}"
Original file line number Diff line number Diff line change @@ -205,7 +205,7 @@ write_files:
205
205
limits :
206
206
memory : {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
207
207
{{- end }}
208
- - image : 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-188
208
+ - image : 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-189
209
209
name : admission-controller
210
210
lifecycle :
211
211
preStop :
You can’t perform that action at this time.
0 commit comments