linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ha: Remove CPU limits for control plane components (#5171) 

As discussed in #5167 & #5169, Kubernetes CPU limits are not necessarily
discoverable from within the pod. This means that the control plane
processes may allocate far more threads than can actually be used by the
process given its process limits.

This change removes the default CPU limits for all control plane
components. CPU limits may still be set via Helm configuration.
This commit is contained in:
Oliver Gould 2020-11-03 09:18:36 -08:00 committed by GitHub
parent 04e15c8544
commit d6cb0c56cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 55 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/linkerd2/values-ha.yaml
View File

@ -18,7 +18,7 @@ global:
controllerReplicas: 3 controllerReplicas: 3
controllerResources: &controller_resources controllerResources: &controller_resources
cpu: &controller_resources_cpu cpu: &controller_resources_cpu
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -48,7 +48,7 @@ heartbeatResources: *controller_resources
prometheus: prometheus:
resources: resources:
cpu: cpu:
limit: "4" limit: ""
request: 300m request: 300m
memory: memory:
limit: 8192Mi limit: 8192Mi

32
cli/cmd/testdata/install_ha_output.golden vendored
View File

@ -812,7 +812,7 @@ data:
destinationProxyResources: null destinationProxyResources: null
destinationResources: destinationResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -920,14 +920,14 @@ data:
enabled: true enabled: true
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 1024Mi limit: 1024Mi
request: 50Mi request: 50Mi
heartbeatResources: heartbeatResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -957,7 +957,7 @@ data:
identityProxyResources: null identityProxyResources: null
identityResources: identityResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -980,7 +980,7 @@ data:
enabled: true enabled: true
resources: resources:
cpu: cpu:
limit: "4" limit: ""
request: 300m request: 300m
memory: memory:
limit: 8192Mi limit: 8192Mi
@ -998,7 +998,7 @@ data:
proxyInjectorProxyResources: null proxyInjectorProxyResources: null
proxyInjectorResources: proxyInjectorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1006,7 +1006,7 @@ data:
publicAPIProxyResources: null publicAPIProxyResources: null
publicAPIResources: publicAPIResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1015,7 +1015,7 @@ data:
spValidatorProxyResources: null spValidatorProxyResources: null
spValidatorResources: spValidatorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1027,7 +1027,7 @@ data:
tapProxyResources: null tapProxyResources: null
tapResources: tapResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1039,7 +1039,7 @@ data:
webProxyResources: null webProxyResources: null
webResources: webResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1190,7 +1190,6 @@ spec:
port: 9990 port: 9990
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1461,7 +1460,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1747,7 +1745,6 @@ spec:
port: 9996 port: 9996
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1949,7 +1946,6 @@ spec:
- "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090" - "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090"
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2045,7 +2041,6 @@ spec:
port: 9994 port: 9994
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2285,7 +2280,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2575,7 +2569,6 @@ spec:
port: 9997 port: 9997
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2850,7 +2843,6 @@ spec:
port: 9998 port: 9998
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3170,7 +3162,6 @@ spec:
port: 3000 port: 3000
resources: resources:
limits: limits:
cpu: "1"
memory: "1024Mi" memory: "1024Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3614,7 +3605,6 @@ spec:
timeoutSeconds: 30 timeoutSeconds: 30
resources: resources:
limits: limits:
cpu: "4"
memory: "8192Mi" memory: "8192Mi"
requests: requests:
cpu: "300m" cpu: "300m"
@ -3787,7 +3777,7 @@ spec:
--- ---
apiVersion: v1 apiVersion: v1
data: data:
linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAzCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKZW5hYmxlUG9kQW50aUFmZmluaXR5OiB0cnVlCmdsb2JhbDoKICBjb250cm9sbGVySW1hZ2VWZXJzaW9uOiBpbnN0YWxsLWNvbnRyb2wtcGxhbmUtdmVyc2lvbgogIGlkZW50aXR5VHJ1c3RBbmNob3JzUEVNOiB8CiAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgIE1JSUJ3VENDQVdhZ0F3SUJBZ0lRZURacDVsRGFJeWdRNVVmTUtackZBVEFLQmdncWhrak9QUVFEQWpBcE1TY3cKICAgIEpRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXJaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dIaGNOTWpBd09ESTQKICAgIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICAgIFpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFScWM3MFoKICAgIGwxdmd3NzlyakI1dVNJVElDVUE2R3lmdlNGZmN1SWlzN0IvWEZTa2t3QUhVNVMvczFBQVArUjBUWDdIQldVQzQKICAgIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAgIC93SUJBVEFkQmdOVkhRNEVGZ1FVNVl0alZWUGZkN0k3TkxIc24yQzI2RUJ5R1Ywd0tRWURWUjBSQkNJd0lJSWUKICAgIGFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQW9HQ0NxR1NNNDlCQU1DQTBrQU1FWUMKICAgIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICAgIHZnVUMwZDIvOUZNdWVJVk1iKzQ2V1RDT2pzcXIKICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICBpbWFnZVB1bGxTZWNyZXRzOiBudWxsCiAgcHJveHk6CiAgICBpbWFnZToKICAgICAgdmVyc2lvbjogaW5zdGFsbC1wcm94eS12ZXJzaW9uCiAgICByZXNvdXJjZXM6CiAgICAgIGNwdToKICAgICAgICByZXF1ZXN0OiAxMDBtCiAgICAgIG1lbW9yeToKICAgICAgICBsaW1pdDogMjUwTWkKICAgICAgICByZXF1ZXN0OiAyME1pCmdyYWZhbmE6CiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogIjEiCiAgICAgIHJlcXVlc3Q6IDEwMG0KICAgIG1lbW9yeToKICAgICAgbGltaXQ6IDEwMjRNaQogICAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgY3J0RXhwaXJ5OiAiMjAzMC0wOC0yNlQwNzoxMzo0N1oiCiAgICB0bHM6CiAgICAgIGNydFBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQogICAgICAgIE1JSUJ3RENDQVdlZ0F3SUJBZ0lSQUpSSWdaOFJ0TzhFd2cxWGVwZjhUNDR3Q2dZSUtvWkl6ajBFQXdJd0tURW4KICAgICAgICBNQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUI0WERUSXdNRGd5CiAgICAgICAgT0RBM01UTTBOMW9YRFRNd01EZ3lOakEzTVRNME4xb3dLVEVuTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdQogICAgICAgIGEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRTEvRnAKICAgICAgICBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzJkUXZSYVlhbnV4RDM2RHQxCiAgICAgICAgMi9KeHlpU2d4S1dSZG9heSthTndNRzR3RGdZRFZSMFBBUUgvQkFRREFnRUdNQklHQTFVZEV3RUIvd1FJTUFZQgogICAgICAgIEFmOENBUUF3SFFZRFZSME9CQllFRkkxV25ycU1ZS2FISE9vK3pweWlpRHEycE8wS01Da0dBMVVkRVFRaU1DQ0MKICAgICAgICBIbWxrWlc1MGFYUjVMbXhwYm10bGNtUXVZMngxYzNSbGNpNXNiMk5oYkRBS0JnZ3Foa2pPUFFRREFnTkhBREJFCiAgICAgICAgQWlBdHVvSTVYdUN0ckdWUnpTbVJUbDJyYTI4YVY5TXlUVTdkNXFuVEFGSEtTZ0lnUktDdmx1T1NnQTVPMjFwNQogICAgICAgIDUxdGRybWtIRVpScjBxbExTSmRIWWdFZk16az0KICAgICAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgICAgIGtleVBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gRUMgUFJJVkFURSBLRVktLS0tLQogICAgICAgIE1IY0NBUUVFSUFBZThuZmJ6WnU5Yy9PQjIrOHhKTTBGejdOVXdUUWF6dWxrRk5zNFRJNStvQW9HQ0NxR1NNNDkKICAgICAgICBBd0VIb1VRRFFnQUUxL0ZwZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyCiAgICAgICAgZFF2UmFZYW51eEQzNkR0MTIvSnh5aVNneEtXUmRvYXkrUT09CiAgICAgICAgLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQppZGVudGl0eVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiAxME1pCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGNydFBFTTogcHJvZmlsZSB2YWxpZGF0b3IgY3J0CiAga2V5UEVNOiBwcm9maWxlIHZhbGlkYXRvciBrZXkKcHJvbWV0aGV1czoKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiAiNCIKICAgICAgcmVxdWVzdDogMzAwbQogICAgbWVtb3J5OgogICAgICBsaW1pdDogODE5Mk1pCiAgICAgIHJlcXVlc3Q6IDMwME1pCnByb3h5SW5qZWN0b3I6CiAgY2FCdW5kbGU6IHByb3h5IGluamVjdG9yIENBIGJ1bmRsZQogIGNydFBFTTogcHJveHkgaW5qZWN0b3IgY3J0CiAga2V5UEVNOiBwcm94eSBpbmplY3RvciBrZXkKcHJveHlJbmplY3RvclJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnB1YmxpY0FQSVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnNwVmFsaWRhdG9yUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKdGFwOgogIGNhQnVuZGxlOiB0YXAgQ0EgYnVuZGxlCiAgY3J0UEVNOiB0YXAgY3J0CiAga2V5UEVNOiB0YXAga2V5CnRhcFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCndlYlJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCndlYmhvb2tGYWlsdXJlUG9saWN5OiBGYWlsCg== linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAzCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQplbmFibGVQb2RBbnRpQWZmaW5pdHk6IHRydWUKZ2xvYmFsOgogIGNvbnRyb2xsZXJJbWFnZVZlcnNpb246IGluc3RhbGwtY29udHJvbC1wbGFuZS12ZXJzaW9uCiAgaWRlbnRpdHlUcnVzdEFuY2hvcnNQRU06IHwKICAgIC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQogICAgTUlJQndUQ0NBV2FnQXdJQkFnSVFlRFpwNWxEYUl5Z1E1VWZNS1pyRkFUQUtCZ2dxaGtqT1BRUURBakFwTVNjdwogICAgSlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1clpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3T0RJNAogICAgTURjeE1qUTNXaGNOTXpBd09ESTJNRGN4TWpRM1dqQXBNU2N3SlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1cgogICAgWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPUFFNQkJ3TkNBQVJxYzcwWgogICAgbDF2Z3c3OXJqQjV1U0lUSUNVQTZHeWZ2U0ZmY3VJaXM3Qi9YRlNra3dBSFU1Uy9zMUFBUCtSMFRYN0hCV1VDNAogICAgdWFHNFdXc2l3SktObjdtZ28zQXdiakFPQmdOVkhROEJBZjhFQkFNQ0FRWXdFZ1lEVlIwVEFRSC9CQWd3QmdFQgogICAgL3dJQkFUQWRCZ05WSFE0RUZnUVU1WXRqVlZQZmQ3STdOTEhzbjJDMjZFQnlHVjB3S1FZRFZSMFJCQ0l3SUlJZQogICAgYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Bb0dDQ3FHU000OUJBTUNBMGtBTUVZQwogICAgSVFDTjdsQkZMRER2ang2VjArWGtqcEtFUlJzSllmNWFkTXZubG9GbDQ4aWxKZ0loQU50eGhuZGNyK1FKUHVDOAogICAgdmdVQzBkMi85Rk11ZUlWTWIrNDZXVENPanNxcgogICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogIGltYWdlUHVsbFNlY3JldHM6IG51bGwKICBwcm94eToKICAgIGltYWdlOgogICAgICB2ZXJzaW9uOiBpbnN0YWxsLXByb3h5LXZlcnNpb24KICAgIHJlc291cmNlczoKICAgICAgY3B1OgogICAgICAgIHJlcXVlc3Q6IDEwMG0KICAgICAgbWVtb3J5OgogICAgICAgIGxpbWl0OiAyNTBNaQogICAgICAgIHJlcXVlc3Q6IDIwTWkKZ3JhZmFuYToKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiAiIgogICAgICByZXF1ZXN0OiAxMDBtCiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiAxMDI0TWkKICAgICAgcmVxdWVzdDogNTBNaQpoZWFydGJlYXRSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgY3J0RXhwaXJ5OiAiMjAzMC0wOC0yNlQwNzoxMzo0N1oiCiAgICB0bHM6CiAgICAgIGNydFBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQogICAgICAgIE1JSUJ3RENDQVdlZ0F3SUJBZ0lSQUpSSWdaOFJ0TzhFd2cxWGVwZjhUNDR3Q2dZSUtvWkl6ajBFQXdJd0tURW4KICAgICAgICBNQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUI0WERUSXdNRGd5CiAgICAgICAgT0RBM01UTTBOMW9YRFRNd01EZ3lOakEzTVRNME4xb3dLVEVuTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdQogICAgICAgIGEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRTEvRnAKICAgICAgICBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzJkUXZSYVlhbnV4RDM2RHQxCiAgICAgICAgMi9KeHlpU2d4S1dSZG9heSthTndNRzR3RGdZRFZSMFBBUUgvQkFRREFnRUdNQklHQTFVZEV3RUIvd1FJTUFZQgogICAgICAgIEFmOENBUUF3SFFZRFZSME9CQllFRkkxV25ycU1ZS2FISE9vK3pweWlpRHEycE8wS01Da0dBMVVkRVFRaU1DQ0MKICAgICAgICBIbWxrWlc1MGFYUjVMbXhwYm10bGNtUXVZMngxYzNSbGNpNXNiMk5oYkRBS0JnZ3Foa2pPUFFRREFnTkhBREJFCiAgICAgICAgQWlBdHVvSTVYdUN0ckdWUnpTbVJUbDJyYTI4YVY5TXlUVTdkNXFuVEFGSEtTZ0lnUktDdmx1T1NnQTVPMjFwNQogICAgICAgIDUxdGRybWtIRVpScjBxbExTSmRIWWdFZk16az0KICAgICAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgICAgIGtleVBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gRUMgUFJJVkFURSBLRVktLS0tLQogICAgICAgIE1IY0NBUUVFSUFBZThuZmJ6WnU5Yy9PQjIrOHhKTTBGejdOVXdUUWF6dWxrRk5zNFRJNStvQW9HQ0NxR1NNNDkKICAgICAgICBBd0VIb1VRRFFnQUUxL0ZwZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyCiAgICAgICAgZFF2UmFZYW51eEQzNkR0MTIvSnh5aVNneEtXUmRvYXkrUT09CiAgICAgICAgLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQppZGVudGl0eVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIiIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDEwTWkKcHJvZmlsZVZhbGlkYXRvcjoKICBjYUJ1bmRsZTogcHJvZmlsZSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgY3J0UEVNOiBwcm9maWxlIHZhbGlkYXRvciBjcnQKICBrZXlQRU06IHByb2ZpbGUgdmFsaWRhdG9yIGtleQpwcm9tZXRoZXVzOgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6ICIiCiAgICAgIHJlcXVlc3Q6IDMwMG0KICAgIG1lbW9yeToKICAgICAgbGltaXQ6IDgxOTJNaQogICAgICByZXF1ZXN0OiAzMDBNaQpwcm94eUluamVjdG9yOgogIGNhQnVuZGxlOiBwcm94eSBpbmplY3RvciBDQSBidW5kbGUKICBjcnRQRU06IHByb3h5IGluamVjdG9yIGNydAogIGtleVBFTTogcHJveHkgaW5qZWN0b3Iga2V5CnByb3h5SW5qZWN0b3JSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnB1YmxpY0FQSVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIiIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKc3BWYWxpZGF0b3JSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnRhcDoKICBjYUJ1bmRsZTogdGFwIENBIGJ1bmRsZQogIGNydFBFTTogdGFwIGNydAogIGtleVBFTTogdGFwIGtleQp0YXBSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCndlYlJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIiIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKd2ViaG9va0ZhaWx1cmVQb2xpY3k6IEZhaWwK
kind: Secret kind: Secret
metadata: metadata:
creationTimestamp: null creationTimestamp: null

32
cli/cmd/testdata/install_ha_with_overrides_output.golden vendored
View File

@ -812,7 +812,7 @@ data:
destinationProxyResources: null destinationProxyResources: null
destinationResources: destinationResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -920,14 +920,14 @@ data:
enabled: true enabled: true
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 1024Mi limit: 1024Mi
request: 50Mi request: 50Mi
heartbeatResources: heartbeatResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -957,7 +957,7 @@ data:
identityProxyResources: null identityProxyResources: null
identityResources: identityResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -980,7 +980,7 @@ data:
enabled: true enabled: true
resources: resources:
cpu: cpu:
limit: "4" limit: ""
request: 300m request: 300m
memory: memory:
limit: 8192Mi limit: 8192Mi
@ -998,7 +998,7 @@ data:
proxyInjectorProxyResources: null proxyInjectorProxyResources: null
proxyInjectorResources: proxyInjectorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1006,7 +1006,7 @@ data:
publicAPIProxyResources: null publicAPIProxyResources: null
publicAPIResources: publicAPIResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1015,7 +1015,7 @@ data:
spValidatorProxyResources: null spValidatorProxyResources: null
spValidatorResources: spValidatorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1027,7 +1027,7 @@ data:
tapProxyResources: null tapProxyResources: null
tapResources: tapResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1039,7 +1039,7 @@ data:
webProxyResources: null webProxyResources: null
webResources: webResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1190,7 +1190,6 @@ spec:
port: 9990 port: 9990
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1461,7 +1460,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1747,7 +1745,6 @@ spec:
port: 9996 port: 9996
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1949,7 +1946,6 @@ spec:
- "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090" - "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090"
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2045,7 +2041,6 @@ spec:
port: 9994 port: 9994
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2285,7 +2280,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2575,7 +2569,6 @@ spec:
port: 9997 port: 9997
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2850,7 +2843,6 @@ spec:
port: 9998 port: 9998
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3170,7 +3162,6 @@ spec:
port: 3000 port: 3000
resources: resources:
limits: limits:
cpu: "1"
memory: "1024Mi" memory: "1024Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3614,7 +3605,6 @@ spec:
timeoutSeconds: 30 timeoutSeconds: 30
resources: resources:
limits: limits:
cpu: "4"
memory: "8192Mi" memory: "8192Mi"
requests: requests:
cpu: "300m" cpu: "300m"
@ -3787,7 +3777,7 @@ spec:
--- ---
apiVersion: v1 apiVersion: v1
data: data:
linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAyCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKZW5hYmxlUG9kQW50aUFmZmluaXR5OiB0cnVlCmdsb2JhbDoKICBjb250cm9sbGVySW1hZ2VWZXJzaW9uOiBpbnN0YWxsLWNvbnRyb2wtcGxhbmUtdmVyc2lvbgogIGhpZ2hBdmFpbGFiaWxpdHk6IHRydWUKICBpZGVudGl0eVRydXN0QW5jaG9yc1BFTTogfAogICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgICBKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3SGhjTk1qQXdPREk0CiAgICBNRGN4TWpRM1doY05NekF3T0RJMk1EY3hNalEzV2pBcE1TY3dKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyCiAgICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgICBsMXZndzc5cmpCNXVTSVRJQ1VBNkd5ZnZTRmZjdUlpczdCL1hGU2trd0FIVTVTL3MxQUFQK1IwVFg3SEJXVUM0CiAgICB1YUc0V1dzaXdKS05uN21nbzNBd2JqQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCCiAgICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgICBhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUFvR0NDcUdTTTQ5QkFNQ0Ewa0FNRVlDCiAgICBJUUNON2xCRkxERHZqeDZWMCtYa2pwS0VSUnNKWWY1YWRNdm5sb0ZsNDhpbEpnSWhBTnR4aG5kY3IrUUpQdUM4CiAgICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgaW1hZ2VQdWxsU2VjcmV0czogbnVsbAogIHByb3h5OgogICAgaW1hZ2U6CiAgICAgIHZlcnNpb246IGluc3RhbGwtcHJveHktdmVyc2lvbgogICAgcmVzb3VyY2VzOgogICAgICBjcHU6CiAgICAgICAgcmVxdWVzdDogNDAwbQogICAgICBtZW1vcnk6CiAgICAgICAgbGltaXQ6IDI1ME1pCiAgICAgICAgcmVxdWVzdDogMzAwTWkKZ3JhZmFuYToKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiAiMSIKICAgICAgcmVxdWVzdDogMTAwbQogICAgbWVtb3J5OgogICAgICBsaW1pdDogMTAyNE1pCiAgICAgIHJlcXVlc3Q6IDUwTWkKaGVhcnRiZWF0UmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKaGVhcnRiZWF0U2NoZWR1bGU6IDEgMiAzIDQgNQppZGVudGl0eToKICBpc3N1ZXI6CiAgICBjcnRFeHBpcnk6ICIyMDMwLTA4LTI2VDA3OjEzOjQ3WiIKICAgIHRsczoKICAgICAgY3J0UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICAgICAgTUlJQndEQ0NBV2VnQXdJQkFnSVJBSlJJZ1o4UnRPOEV3ZzFYZXBmOFQ0NHdDZ1lJS29aSXpqMEVBd0l3S1RFbgogICAgICAgIE1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQjRYRFRJd01EZ3kKICAgICAgICBPREEzTVRNME4xb1hEVE13TURneU5qQTNNVE0wTjFvd0tURW5NQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1CiAgICAgICAgYTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFMS9GcAogICAgICAgIGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MmRRdlJhWWFudXhEMzZEdDEKICAgICAgICAyL0p4eWlTZ3hLV1Jkb2F5K2FOd01HNHdEZ1lEVlIwUEFRSC9CQVFEQWdFR01CSUdBMVVkRXdFQi93UUlNQVlCCiAgICAgICAgQWY4Q0FRQXdIUVlEVlIwT0JCWUVGSTFXbnJxTVlLYUhIT28renB5aWlEcTJwTzBLTUNrR0ExVWRFUVFpTUNDQwogICAgICAgIEhtbGtaVzUwYVhSNUxteHBibXRsY21RdVkyeDFjM1JsY2k1c2IyTmhiREFLQmdncWhrak9QUVFEQWdOSEFEQkUKICAgICAgICBBaUF0dW9JNVh1Q3RyR1ZSelNtUlRsMnJhMjhhVjlNeVRVN2Q1cW5UQUZIS1NnSWdSS0N2bHVPU2dBNU8yMXA1CiAgICAgICAgNTF0ZHJta0hFWlJyMHFsTFNKZEhZZ0VmTXprPQogICAgICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICAgICAga2V5UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCiAgICAgICAgTUhjQ0FRRUVJQUFlOG5mYnpadTljL09CMis4eEpNMEZ6N05Vd1RRYXp1bGtGTnM0VEk1K29Bb0dDQ3FHU000OQogICAgICAgIEF3RUhvVVFEUWdBRTEvRnBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzIKICAgICAgICBkUXZSYVlhbnV4RDM2RHQxMi9KeHlpU2d4S1dSZG9heStRPT0KICAgICAgICAtLS0tLUVORCBFQyBQUklWQVRFIEtFWS0tLS0tCmlkZW50aXR5UmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDEwTWkKcHJvZmlsZVZhbGlkYXRvcjoKICBjYUJ1bmRsZTogcHJvZmlsZSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgY3J0UEVNOiBwcm9maWxlIHZhbGlkYXRvciBjcnQKICBrZXlQRU06IHByb2ZpbGUgdmFsaWRhdG9yIGtleQpwcm9tZXRoZXVzOgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6ICI0IgogICAgICByZXF1ZXN0OiAzMDBtCiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiA4MTkyTWkKICAgICAgcmVxdWVzdDogMzAwTWkKcHJveHlJbmplY3RvcjoKICBjYUJ1bmRsZTogcHJveHkgaW5qZWN0b3IgQ0EgYnVuZGxlCiAgY3J0UEVNOiBwcm94eSBpbmplY3RvciBjcnQKICBrZXlQRU06IHByb3h5IGluamVjdG9yIGtleQpwcm94eUluamVjdG9yUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKcHVibGljQVBJUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKc3BWYWxpZGF0b3JSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQp0YXA6CiAgY2FCdW5kbGU6IHRhcCBDQSBidW5kbGUKICBjcnRQRU06IHRhcCBjcnQKICBrZXlQRU06IHRhcCBrZXkKdGFwUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKd2ViUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKd2ViaG9va0ZhaWx1cmVQb2xpY3k6IEZhaWwK linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAyCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQplbmFibGVQb2RBbnRpQWZmaW5pdHk6IHRydWUKZ2xvYmFsOgogIGNvbnRyb2xsZXJJbWFnZVZlcnNpb246IGluc3RhbGwtY29udHJvbC1wbGFuZS12ZXJzaW9uCiAgaGlnaEF2YWlsYWJpbGl0eTogdHJ1ZQogIGlkZW50aXR5VHJ1c3RBbmNob3JzUEVNOiB8CiAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgIE1JSUJ3VENDQVdhZ0F3SUJBZ0lRZURacDVsRGFJeWdRNVVmTUtackZBVEFLQmdncWhrak9QUVFEQWpBcE1TY3cKICAgIEpRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXJaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dIaGNOTWpBd09ESTQKICAgIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICAgIFpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFScWM3MFoKICAgIGwxdmd3NzlyakI1dVNJVElDVUE2R3lmdlNGZmN1SWlzN0IvWEZTa2t3QUhVNVMvczFBQVArUjBUWDdIQldVQzQKICAgIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAgIC93SUJBVEFkQmdOVkhRNEVGZ1FVNVl0alZWUGZkN0k3TkxIc24yQzI2RUJ5R1Ywd0tRWURWUjBSQkNJd0lJSWUKICAgIGFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQW9HQ0NxR1NNNDlCQU1DQTBrQU1FWUMKICAgIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICAgIHZnVUMwZDIvOUZNdWVJVk1iKzQ2V1RDT2pzcXIKICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICBpbWFnZVB1bGxTZWNyZXRzOiBudWxsCiAgcHJveHk6CiAgICBpbWFnZToKICAgICAgdmVyc2lvbjogaW5zdGFsbC1wcm94eS12ZXJzaW9uCiAgICByZXNvdXJjZXM6CiAgICAgIGNwdToKICAgICAgICByZXF1ZXN0OiA0MDBtCiAgICAgIG1lbW9yeToKICAgICAgICBsaW1pdDogMjUwTWkKICAgICAgICByZXF1ZXN0OiAzMDBNaQpncmFmYW5hOgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6ICIiCiAgICAgIHJlcXVlc3Q6IDEwMG0KICAgIG1lbW9yeToKICAgICAgbGltaXQ6IDEwMjRNaQogICAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIiIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKaGVhcnRiZWF0U2NoZWR1bGU6IDEgMiAzIDQgNQppZGVudGl0eToKICBpc3N1ZXI6CiAgICBjcnRFeHBpcnk6ICIyMDMwLTA4LTI2VDA3OjEzOjQ3WiIKICAgIHRsczoKICAgICAgY3J0UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICAgICAgTUlJQndEQ0NBV2VnQXdJQkFnSVJBSlJJZ1o4UnRPOEV3ZzFYZXBmOFQ0NHdDZ1lJS29aSXpqMEVBd0l3S1RFbgogICAgICAgIE1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQjRYRFRJd01EZ3kKICAgICAgICBPREEzTVRNME4xb1hEVE13TURneU5qQTNNVE0wTjFvd0tURW5NQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1CiAgICAgICAgYTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFMS9GcAogICAgICAgIGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MmRRdlJhWWFudXhEMzZEdDEKICAgICAgICAyL0p4eWlTZ3hLV1Jkb2F5K2FOd01HNHdEZ1lEVlIwUEFRSC9CQVFEQWdFR01CSUdBMVVkRXdFQi93UUlNQVlCCiAgICAgICAgQWY4Q0FRQXdIUVlEVlIwT0JCWUVGSTFXbnJxTVlLYUhIT28renB5aWlEcTJwTzBLTUNrR0ExVWRFUVFpTUNDQwogICAgICAgIEhtbGtaVzUwYVhSNUxteHBibXRsY21RdVkyeDFjM1JsY2k1c2IyTmhiREFLQmdncWhrak9QUVFEQWdOSEFEQkUKICAgICAgICBBaUF0dW9JNVh1Q3RyR1ZSelNtUlRsMnJhMjhhVjlNeVRVN2Q1cW5UQUZIS1NnSWdSS0N2bHVPU2dBNU8yMXA1CiAgICAgICAgNTF0ZHJta0hFWlJyMHFsTFNKZEhZZ0VmTXprPQogICAgICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICAgICAga2V5UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCiAgICAgICAgTUhjQ0FRRUVJQUFlOG5mYnpadTljL09CMis4eEpNMEZ6N05Vd1RRYXp1bGtGTnM0VEk1K29Bb0dDQ3FHU000OQogICAgICAgIEF3RUhvVVFEUWdBRTEvRnBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzIKICAgICAgICBkUXZSYVlhbnV4RDM2RHQxMi9KeHlpU2d4S1dSZG9heStRPT0KICAgICAgICAtLS0tLUVORCBFQyBQUklWQVRFIEtFWS0tLS0tCmlkZW50aXR5UmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogMTBNaQpwcm9maWxlVmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwcm9maWxlIHZhbGlkYXRvciBDQSBidW5kbGUKICBjcnRQRU06IHByb2ZpbGUgdmFsaWRhdG9yIGNydAogIGtleVBFTTogcHJvZmlsZSB2YWxpZGF0b3Iga2V5CnByb21ldGhldXM6CiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogIiIKICAgICAgcmVxdWVzdDogMzAwbQogICAgbWVtb3J5OgogICAgICBsaW1pdDogODE5Mk1pCiAgICAgIHJlcXVlc3Q6IDMwME1pCnByb3h5SW5qZWN0b3I6CiAgY2FCdW5kbGU6IHByb3h5IGluamVjdG9yIENBIGJ1bmRsZQogIGNydFBFTTogcHJveHkgaW5qZWN0b3IgY3J0CiAga2V5UEVNOiBwcm94eSBpbmplY3RvciBrZXkKcHJveHlJbmplY3RvclJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIiIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKcHVibGljQVBJUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQpzcFZhbGlkYXRvclJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIiIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKdGFwOgogIGNhQnVuZGxlOiB0YXAgQ0EgYnVuZGxlCiAgY3J0UEVNOiB0YXAgY3J0CiAga2V5UEVNOiB0YXAga2V5CnRhcFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIiIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKd2ViUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQp3ZWJob29rRmFpbHVyZVBvbGljeTogRmFpbAo=
kind: Secret kind: Secret
metadata: metadata:
creationTimestamp: null creationTimestamp: null

30
cli/cmd/testdata/install_helm_output_ha.golden vendored
View File

@ -838,7 +838,7 @@ data:
destinationProxyResources: null destinationProxyResources: null
destinationResources: destinationResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1103,14 +1103,14 @@ data:
workloadNamespaceLabel: linkerd.io/workload-ns workloadNamespaceLabel: linkerd.io/workload-ns
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 1024Mi limit: 1024Mi
request: 50Mi request: 50Mi
heartbeatResources: heartbeatResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1128,7 +1128,7 @@ data:
identityProxyResources: null identityProxyResources: null
identityResources: identityResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1328,7 +1328,7 @@ data:
workloadNamespaceLabel: linkerd.io/workload-ns workloadNamespaceLabel: linkerd.io/workload-ns
resources: resources:
cpu: cpu:
limit: "4" limit: ""
request: 300m request: 300m
memory: memory:
limit: 8192Mi limit: 8192Mi
@ -1346,7 +1346,7 @@ data:
proxyInjectorProxyResources: null proxyInjectorProxyResources: null
proxyInjectorResources: proxyInjectorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1354,7 +1354,7 @@ data:
publicAPIProxyResources: null publicAPIProxyResources: null
publicAPIResources: publicAPIResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1363,7 +1363,7 @@ data:
spValidatorProxyResources: null spValidatorProxyResources: null
spValidatorResources: spValidatorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1375,7 +1375,7 @@ data:
tapProxyResources: null tapProxyResources: null
tapResources: tapResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1387,7 +1387,7 @@ data:
webProxyResources: null webProxyResources: null
webResources: webResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1540,7 +1540,6 @@ spec:
port: 9990 port: 9990
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1802,7 +1801,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2079,7 +2077,6 @@ spec:
port: 9996 port: 9996
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2272,7 +2269,6 @@ spec:
- "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090" - "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090"
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2370,7 +2366,6 @@ spec:
port: 9994 port: 9994
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2602,7 +2597,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2884,7 +2878,6 @@ spec:
port: 9997 port: 9997
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3151,7 +3144,6 @@ spec:
port: 9998 port: 9998
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3464,7 +3456,6 @@ spec:
port: 3000 port: 3000
resources: resources:
limits: limits:
cpu: "1"
memory: "1024Mi" memory: "1024Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3901,7 +3892,6 @@ spec:
timeoutSeconds: 30 timeoutSeconds: 30
resources: resources:
limits: limits:
cpu: "4"
memory: "8192Mi" memory: "8192Mi"
requests: requests:
cpu: "300m" cpu: "300m"

30
cli/cmd/testdata/install_helm_output_ha_labels.golden vendored
View File

@ -838,7 +838,7 @@ data:
destinationProxyResources: null destinationProxyResources: null
destinationResources: destinationResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1115,14 +1115,14 @@ data:
workloadNamespaceLabel: linkerd.io/workload-ns workloadNamespaceLabel: linkerd.io/workload-ns
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 1024Mi limit: 1024Mi
request: 50Mi request: 50Mi
heartbeatResources: heartbeatResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1140,7 +1140,7 @@ data:
identityProxyResources: null identityProxyResources: null
identityResources: identityResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1348,7 +1348,7 @@ data:
workloadNamespaceLabel: linkerd.io/workload-ns workloadNamespaceLabel: linkerd.io/workload-ns
resources: resources:
cpu: cpu:
limit: "4" limit: ""
request: 300m request: 300m
memory: memory:
limit: 8192Mi limit: 8192Mi
@ -1366,7 +1366,7 @@ data:
proxyInjectorProxyResources: null proxyInjectorProxyResources: null
proxyInjectorResources: proxyInjectorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1374,7 +1374,7 @@ data:
publicAPIProxyResources: null publicAPIProxyResources: null
publicAPIResources: publicAPIResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1383,7 +1383,7 @@ data:
spValidatorProxyResources: null spValidatorProxyResources: null
spValidatorResources: spValidatorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1395,7 +1395,7 @@ data:
tapProxyResources: null tapProxyResources: null
tapResources: tapResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1407,7 +1407,7 @@ data:
webProxyResources: null webProxyResources: null
webResources: webResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1564,7 +1564,6 @@ spec:
port: 9990 port: 9990
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1830,7 +1829,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2111,7 +2109,6 @@ spec:
port: 9996 port: 9996
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2308,7 +2305,6 @@ spec:
- "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090" - "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090"
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2410,7 +2406,6 @@ spec:
port: 9994 port: 9994
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2646,7 +2641,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2932,7 +2926,6 @@ spec:
port: 9997 port: 9997
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3203,7 +3196,6 @@ spec:
port: 9998 port: 9998
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3520,7 +3512,6 @@ spec:
port: 3000 port: 3000
resources: resources:
limits: limits:
cpu: "1"
memory: "1024Mi" memory: "1024Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3961,7 +3952,6 @@ spec:
timeoutSeconds: 30 timeoutSeconds: 30
resources: resources:
limits: limits:
cpu: "4"
memory: "8192Mi" memory: "8192Mi"
requests: requests:
cpu: "300m" cpu: "300m"

30
cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden vendored
View File

@ -838,7 +838,7 @@ data:
destinationProxyResources: null destinationProxyResources: null
destinationResources: destinationResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1103,14 +1103,14 @@ data:
workloadNamespaceLabel: linkerd.io/workload-ns workloadNamespaceLabel: linkerd.io/workload-ns
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 1024Mi limit: 1024Mi
request: 50Mi request: 50Mi
heartbeatResources: heartbeatResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1128,7 +1128,7 @@ data:
identityProxyResources: null identityProxyResources: null
identityResources: identityResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1328,7 +1328,7 @@ data:
workloadNamespaceLabel: linkerd.io/workload-ns workloadNamespaceLabel: linkerd.io/workload-ns
resources: resources:
cpu: cpu:
limit: "4" limit: ""
request: 300m request: 300m
memory: memory:
limit: 8192Mi limit: 8192Mi
@ -1346,7 +1346,7 @@ data:
proxyInjectorProxyResources: null proxyInjectorProxyResources: null
proxyInjectorResources: proxyInjectorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1354,7 +1354,7 @@ data:
publicAPIProxyResources: null publicAPIProxyResources: null
publicAPIResources: publicAPIResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1363,7 +1363,7 @@ data:
spValidatorProxyResources: null spValidatorProxyResources: null
spValidatorResources: spValidatorResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1375,7 +1375,7 @@ data:
tapProxyResources: null tapProxyResources: null
tapResources: tapResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1387,7 +1387,7 @@ data:
webProxyResources: null webProxyResources: null
webResources: webResources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1540,7 +1540,6 @@ spec:
port: 9990 port: 9990
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1802,7 +1801,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2079,7 +2077,6 @@ spec:
port: 9996 port: 9996
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2272,7 +2269,6 @@ spec:
- "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090" - "-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090"
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2370,7 +2366,6 @@ spec:
port: 9994 port: 9994
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2602,7 +2597,6 @@ spec:
port: 9995 port: 9995
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2884,7 +2878,6 @@ spec:
port: 9997 port: 9997
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3151,7 +3144,6 @@ spec:
port: 9998 port: 9998
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3464,7 +3456,6 @@ spec:
port: 3000 port: 3000
resources: resources:
limits: limits:
cpu: "1"
memory: "1024Mi" memory: "1024Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3901,7 +3892,6 @@ spec:
timeoutSeconds: 30 timeoutSeconds: 30
resources: resources:
limits: limits:
cpu: "4"
memory: "8192Mi" memory: "8192Mi"
requests: requests:
cpu: "300m" cpu: "300m"

3
pkg/charts/linkerd2/values_test.go
View File

@ -184,7 +184,6 @@ func TestNewValues(t *testing.T) {
controllerResources := &Resources{ controllerResources := &Resources{
CPU: Constraints{ CPU: Constraints{
Limit: "1",
Request: "100m", Request: "100m",
}, },
Memory: Constraints{ Memory: Constraints{
@ -229,7 +228,7 @@ func TestNewValues(t *testing.T) {
"enabled": true, "enabled": true,
"resources": map[string]interface{}{ "resources": map[string]interface{}{
"cpu": map[string]interface{}{ "cpu": map[string]interface{}{
"limit": "4", "limit": "",
"request": "300m", "request": "300m",
}, },
"memory": map[string]interface{}{ "memory": map[string]interface{}{