From 2ec90aec5b3214a19e6ba55a40fbe3ba4a69253a Mon Sep 17 00:00:00 2001 From: Steve Jenson Date: Tue, 7 Mar 2023 08:59:16 -0800 Subject: [PATCH] update network-validator helm charts to use proxy-init resources (#10461) Signed-off-by: Steve Jenson --- .../partials/templates/_network-validator.tpl | 8 +------ ...to_deployment_no_init_container.golden.yml | 8 +++---- .../testdata/install_no_init_container.golden | 24 +++++++++---------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/charts/partials/templates/_network-validator.tpl b/charts/partials/templates/_network-validator.tpl index 59da26da5..c4d0a30f5 100644 --- a/charts/partials/templates/_network-validator.tpl +++ b/charts/partials/templates/_network-validator.tpl @@ -2,13 +2,7 @@ name: linkerd-network-validator image: {{.Values.proxy.image.name}}:{{.Values.proxy.image.version | default .Values.linkerdVersion }} imagePullPolicy: {{.Values.proxy.image.pullPolicy | default .Values.imagePullPolicy}} -resources: - limits: - cpu: "50m" - memory: "10Mi" - requests: - cpu: "50m" - memory: "10Mi" +{{ include "partials.resources" .Values.proxyInit.resources }} securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml index e2b52a549..21b845606 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml @@ -185,11 +185,11 @@ spec: name: linkerd-network-validator resources: limits: - cpu: 50m - memory: 10Mi + cpu: 100m + memory: 20Mi requests: - cpu: 50m - memory: 10Mi + cpu: 100m + memory: 20Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 141e0eae4..4359ac451 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -954,11 +954,11 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: "50m" - memory: "10Mi" + cpu: "100m" + memory: "20Mi" requests: - cpu: "50m" - memory: "10Mi" + cpu: "100m" + memory: "20Mi" securityContext: allowPrivilegeEscalation: false capabilities: @@ -1406,11 +1406,11 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: "50m" - memory: "10Mi" + cpu: "100m" + memory: "20Mi" requests: - cpu: "50m" - memory: "10Mi" + cpu: "100m" + memory: "20Mi" securityContext: allowPrivilegeEscalation: false capabilities: @@ -1732,11 +1732,11 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: "50m" - memory: "10Mi" + cpu: "100m" + memory: "20Mi" requests: - cpu: "50m" - memory: "10Mi" + cpu: "100m" + memory: "20Mi" securityContext: allowPrivilegeEscalation: false capabilities: