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

ha: Do not set a default CPU limit (#5169) 

Now that the proxy can use more than one core, this behavior should be
enabled by default, even in HA mode.

This change modifies the default HA helm values to unset the cpu limit
for proxy containers.
This commit is contained in:
Oliver Gould 2020-11-03 07:53:36 -08:00 committed by GitHub
parent 8540cd617d
commit 04e15c8544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ global:
proxy: proxy:
resources: resources:
cpu: cpu:
limit: "1"
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi

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

@ -880,7 +880,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1294,7 +1294,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1563,7 +1562,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1850,7 +1848,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2149,7 +2146,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2396,7 +2392,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2685,7 +2680,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2961,7 +2955,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3284,7 +3277,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3732,7 +3724,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3796,7 +3787,7 @@ spec:
--- ---
apiVersion: v1 apiVersion: v1
data: data:
linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAzCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKZW5hYmxlUG9kQW50aUFmZmluaXR5OiB0cnVlCmdsb2JhbDoKICBjb250cm9sbGVySW1hZ2VWZXJzaW9uOiBpbnN0YWxsLWNvbnRyb2wtcGxhbmUtdmVyc2lvbgogIGlkZW50aXR5VHJ1c3RBbmNob3JzUEVNOiB8CiAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgIE1JSUJ3VENDQVdhZ0F3SUJBZ0lRZURacDVsRGFJeWdRNVVmTUtackZBVEFLQmdncWhrak9QUVFEQWpBcE1TY3cKICAgIEpRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXJaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dIaGNOTWpBd09ESTQKICAgIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICAgIFpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFScWM3MFoKICAgIGwxdmd3NzlyakI1dVNJVElDVUE2R3lmdlNGZmN1SWlzN0IvWEZTa2t3QUhVNVMvczFBQVArUjBUWDdIQldVQzQKICAgIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAgIC93SUJBVEFkQmdOVkhRNEVGZ1FVNVl0alZWUGZkN0k3TkxIc24yQzI2RUJ5R1Ywd0tRWURWUjBSQkNJd0lJSWUKICAgIGFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQW9HQ0NxR1NNNDlCQU1DQTBrQU1FWUMKICAgIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICAgIHZnVUMwZDIvOUZNdWVJVk1iKzQ2V1RDT2pzcXIKICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICBpbWFnZVB1bGxTZWNyZXRzOiBudWxsCiAgcHJveHk6CiAgICBpbWFnZToKICAgICAgdmVyc2lvbjogaW5zdGFsbC1wcm94eS12ZXJzaW9uCiAgICByZXNvdXJjZXM6CiAgICAgIGNwdToKICAgICAgICBsaW1pdDogIjEiCiAgICAgICAgcmVxdWVzdDogMTAwbQogICAgICBtZW1vcnk6CiAgICAgICAgbGltaXQ6IDI1ME1pCiAgICAgICAgcmVxdWVzdDogMjBNaQpncmFmYW5hOgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6ICIxIgogICAgICByZXF1ZXN0OiAxMDBtCiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiAxMDI0TWkKICAgICAgcmVxdWVzdDogNTBNaQpoZWFydGJlYXRSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQpoZWFydGJlYXRTY2hlZHVsZTogMSAyIDMgNCA1CmlkZW50aXR5OgogIGlzc3VlcjoKICAgIGNydEV4cGlyeTogIjIwMzAtMDgtMjZUMDc6MTM6NDdaIgogICAgdGxzOgogICAgICBjcnRQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgICAgICBNSUlCd0RDQ0FXZWdBd0lCQWdJUkFKUklnWjhSdE84RXdnMVhlcGY4VDQ0d0NnWUlLb1pJemowRUF3SXdLVEVuCiAgICAgICAgTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01CNFhEVEl3TURneQogICAgICAgIE9EQTNNVE0wTjFvWERUTXdNRGd5TmpBM01UTTBOMW93S1RFbk1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHUKICAgICAgICBhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUUxL0ZwCiAgICAgICAgZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyZFF2UmFZYW51eEQzNkR0MQogICAgICAgIDIvSnh5aVNneEtXUmRvYXkrYU53TUc0d0RnWURWUjBQQVFIL0JBUURBZ0VHTUJJR0ExVWRFd0VCL3dRSU1BWUIKICAgICAgICBBZjhDQVFBd0hRWURWUjBPQkJZRUZJMVducnFNWUthSEhPbyt6cHlpaURxMnBPMEtNQ2tHQTFVZEVRUWlNQ0NDCiAgICAgICAgSG1sa1pXNTBhWFI1TG14cGJtdGxjbVF1WTJ4MWMzUmxjaTVzYjJOaGJEQUtCZ2dxaGtqT1BRUURBZ05IQURCRQogICAgICAgIEFpQXR1b0k1WHVDdHJHVlJ6U21SVGwycmEyOGFWOU15VFU3ZDVxblRBRkhLU2dJZ1JLQ3ZsdU9TZ0E1TzIxcDUKICAgICAgICA1MXRkcm1rSEVaUnIwcWxMU0pkSFlnRWZNems9CiAgICAgICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogICAgICBrZXlQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIEVDIFBSSVZBVEUgS0VZLS0tLS0KICAgICAgICBNSGNDQVFFRUlBQWU4bmZielp1OWMvT0IyKzh4Sk0wRno3TlV3VFFhenVsa0ZOczRUSTUrb0FvR0NDcUdTTTQ5CiAgICAgICAgQXdFSG9VUURRZ0FFMS9GcGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MgogICAgICAgIGRRdlJhWWFudXhEMzZEdDEyL0p4eWlTZ3hLV1Jkb2F5K1E9PQogICAgICAgIC0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0KaWRlbnRpdHlSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogMTBNaQpwcm9maWxlVmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwcm9maWxlIHZhbGlkYXRvciBDQSBidW5kbGUKICBjcnRQRU06IHByb2ZpbGUgdmFsaWRhdG9yIGNydAogIGtleVBFTTogcHJvZmlsZSB2YWxpZGF0b3Iga2V5CnByb21ldGhldXM6CiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogIjQiCiAgICAgIHJlcXVlc3Q6IDMwMG0KICAgIG1lbW9yeToKICAgICAgbGltaXQ6IDgxOTJNaQogICAgICByZXF1ZXN0OiAzMDBNaQpwcm94eUluamVjdG9yOgogIGNhQnVuZGxlOiBwcm94eSBpbmplY3RvciBDQSBidW5kbGUKICBjcnRQRU06IHByb3h5IGluamVjdG9yIGNydAogIGtleVBFTTogcHJveHkgaW5qZWN0b3Iga2V5CnByb3h5SW5qZWN0b3JSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQpwdWJsaWNBUElSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQpzcFZhbGlkYXRvclJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnRhcDoKICBjYUJ1bmRsZTogdGFwIENBIGJ1bmRsZQogIGNydFBFTTogdGFwIGNydAogIGtleVBFTTogdGFwIGtleQp0YXBSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQp3ZWJSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQp3ZWJob29rRmFpbHVyZVBvbGljeTogRmFpbAo= linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAzCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKZW5hYmxlUG9kQW50aUFmZmluaXR5OiB0cnVlCmdsb2JhbDoKICBjb250cm9sbGVySW1hZ2VWZXJzaW9uOiBpbnN0YWxsLWNvbnRyb2wtcGxhbmUtdmVyc2lvbgogIGlkZW50aXR5VHJ1c3RBbmNob3JzUEVNOiB8CiAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgIE1JSUJ3VENDQVdhZ0F3SUJBZ0lRZURacDVsRGFJeWdRNVVmTUtackZBVEFLQmdncWhrak9QUVFEQWpBcE1TY3cKICAgIEpRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXJaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dIaGNOTWpBd09ESTQKICAgIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICAgIFpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFScWM3MFoKICAgIGwxdmd3NzlyakI1dVNJVElDVUE2R3lmdlNGZmN1SWlzN0IvWEZTa2t3QUhVNVMvczFBQVArUjBUWDdIQldVQzQKICAgIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAgIC93SUJBVEFkQmdOVkhRNEVGZ1FVNVl0alZWUGZkN0k3TkxIc24yQzI2RUJ5R1Ywd0tRWURWUjBSQkNJd0lJSWUKICAgIGFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQW9HQ0NxR1NNNDlCQU1DQTBrQU1FWUMKICAgIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICAgIHZnVUMwZDIvOUZNdWVJVk1iKzQ2V1RDT2pzcXIKICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICBpbWFnZVB1bGxTZWNyZXRzOiBudWxsCiAgcHJveHk6CiAgICBpbWFnZToKICAgICAgdmVyc2lvbjogaW5zdGFsbC1wcm94eS12ZXJzaW9uCiAgICByZXNvdXJjZXM6CiAgICAgIGNwdToKICAgICAgICByZXF1ZXN0OiAxMDBtCiAgICAgIG1lbW9yeToKICAgICAgICBsaW1pdDogMjUwTWkKICAgICAgICByZXF1ZXN0OiAyME1pCmdyYWZhbmE6CiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogIjEiCiAgICAgIHJlcXVlc3Q6IDEwMG0KICAgIG1lbW9yeToKICAgICAgbGltaXQ6IDEwMjRNaQogICAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgY3J0RXhwaXJ5OiAiMjAzMC0wOC0yNlQwNzoxMzo0N1oiCiAgICB0bHM6CiAgICAgIGNydFBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQogICAgICAgIE1JSUJ3RENDQVdlZ0F3SUJBZ0lSQUpSSWdaOFJ0TzhFd2cxWGVwZjhUNDR3Q2dZSUtvWkl6ajBFQXdJd0tURW4KICAgICAgICBNQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUI0WERUSXdNRGd5CiAgICAgICAgT0RBM01UTTBOMW9YRFRNd01EZ3lOakEzTVRNME4xb3dLVEVuTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdQogICAgICAgIGEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRTEvRnAKICAgICAgICBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzJkUXZSYVlhbnV4RDM2RHQxCiAgICAgICAgMi9KeHlpU2d4S1dSZG9heSthTndNRzR3RGdZRFZSMFBBUUgvQkFRREFnRUdNQklHQTFVZEV3RUIvd1FJTUFZQgogICAgICAgIEFmOENBUUF3SFFZRFZSME9CQllFRkkxV25ycU1ZS2FISE9vK3pweWlpRHEycE8wS01Da0dBMVVkRVFRaU1DQ0MKICAgICAgICBIbWxrWlc1MGFYUjVMbXhwYm10bGNtUXVZMngxYzNSbGNpNXNiMk5oYkRBS0JnZ3Foa2pPUFFRREFnTkhBREJFCiAgICAgICAgQWlBdHVvSTVYdUN0ckdWUnpTbVJUbDJyYTI4YVY5TXlUVTdkNXFuVEFGSEtTZ0lnUktDdmx1T1NnQTVPMjFwNQogICAgICAgIDUxdGRybWtIRVpScjBxbExTSmRIWWdFZk16az0KICAgICAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgICAgIGtleVBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gRUMgUFJJVkFURSBLRVktLS0tLQogICAgICAgIE1IY0NBUUVFSUFBZThuZmJ6WnU5Yy9PQjIrOHhKTTBGejdOVXdUUWF6dWxrRk5zNFRJNStvQW9HQ0NxR1NNNDkKICAgICAgICBBd0VIb1VRRFFnQUUxL0ZwZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyCiAgICAgICAgZFF2UmFZYW51eEQzNkR0MTIvSnh5aVNneEtXUmRvYXkrUT09CiAgICAgICAgLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQppZGVudGl0eVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiAxME1pCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGNydFBFTTogcHJvZmlsZSB2YWxpZGF0b3IgY3J0CiAga2V5UEVNOiBwcm9maWxlIHZhbGlkYXRvciBrZXkKcHJvbWV0aGV1czoKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiAiNCIKICAgICAgcmVxdWVzdDogMzAwbQogICAgbWVtb3J5OgogICAgICBsaW1pdDogODE5Mk1pCiAgICAgIHJlcXVlc3Q6IDMwME1pCnByb3h5SW5qZWN0b3I6CiAgY2FCdW5kbGU6IHByb3h5IGluamVjdG9yIENBIGJ1bmRsZQogIGNydFBFTTogcHJveHkgaW5qZWN0b3IgY3J0CiAga2V5UEVNOiBwcm94eSBpbmplY3RvciBrZXkKcHJveHlJbmplY3RvclJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnB1YmxpY0FQSVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnNwVmFsaWRhdG9yUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKdGFwOgogIGNhQnVuZGxlOiB0YXAgQ0EgYnVuZGxlCiAgY3J0UEVNOiB0YXAgY3J0CiAga2V5UEVNOiB0YXAga2V5CnRhcFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCndlYlJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCndlYmhvb2tGYWlsdXJlUG9saWN5OiBGYWlsCg==
kind: Secret kind: Secret
metadata: metadata:
creationTimestamp: null creationTimestamp: null

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

@ -880,7 +880,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 400m request: 400m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1294,7 +1294,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -1563,7 +1562,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -1850,7 +1848,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -2149,7 +2146,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -2396,7 +2392,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -2685,7 +2680,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -2961,7 +2955,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -3284,7 +3277,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -3732,7 +3724,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "400m" cpu: "400m"
@ -3796,7 +3787,7 @@ spec:
--- ---
apiVersion: v1 apiVersion: v1
data: data:
linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAyCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKZW5hYmxlUG9kQW50aUFmZmluaXR5OiB0cnVlCmdsb2JhbDoKICBjb250cm9sbGVySW1hZ2VWZXJzaW9uOiBpbnN0YWxsLWNvbnRyb2wtcGxhbmUtdmVyc2lvbgogIGhpZ2hBdmFpbGFiaWxpdHk6IHRydWUKICBpZGVudGl0eVRydXN0QW5jaG9yc1BFTTogfAogICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgICBKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3SGhjTk1qQXdPREk0CiAgICBNRGN4TWpRM1doY05NekF3T0RJMk1EY3hNalEzV2pBcE1TY3dKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyCiAgICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgICBsMXZndzc5cmpCNXVTSVRJQ1VBNkd5ZnZTRmZjdUlpczdCL1hGU2trd0FIVTVTL3MxQUFQK1IwVFg3SEJXVUM0CiAgICB1YUc0V1dzaXdKS05uN21nbzNBd2JqQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCCiAgICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgICBhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUFvR0NDcUdTTTQ5QkFNQ0Ewa0FNRVlDCiAgICBJUUNON2xCRkxERHZqeDZWMCtYa2pwS0VSUnNKWWY1YWRNdm5sb0ZsNDhpbEpnSWhBTnR4aG5kY3IrUUpQdUM4CiAgICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgaW1hZ2VQdWxsU2VjcmV0czogbnVsbAogIHByb3h5OgogICAgaW1hZ2U6CiAgICAgIHZlcnNpb246IGluc3RhbGwtcHJveHktdmVyc2lvbgogICAgcmVzb3VyY2VzOgogICAgICBjcHU6CiAgICAgICAgbGltaXQ6ICIxIgogICAgICAgIHJlcXVlc3Q6IDQwMG0KICAgICAgbWVtb3J5OgogICAgICAgIGxpbWl0OiAyNTBNaQogICAgICAgIHJlcXVlc3Q6IDMwME1pCmdyYWZhbmE6CiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogIjEiCiAgICAgIHJlcXVlc3Q6IDEwMG0KICAgIG1lbW9yeToKICAgICAgbGltaXQ6IDEwMjRNaQogICAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgY3J0RXhwaXJ5OiAiMjAzMC0wOC0yNlQwNzoxMzo0N1oiCiAgICB0bHM6CiAgICAgIGNydFBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQogICAgICAgIE1JSUJ3RENDQVdlZ0F3SUJBZ0lSQUpSSWdaOFJ0TzhFd2cxWGVwZjhUNDR3Q2dZSUtvWkl6ajBFQXdJd0tURW4KICAgICAgICBNQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUI0WERUSXdNRGd5CiAgICAgICAgT0RBM01UTTBOMW9YRFRNd01EZ3lOakEzTVRNME4xb3dLVEVuTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdQogICAgICAgIGEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRTEvRnAKICAgICAgICBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzJkUXZSYVlhbnV4RDM2RHQxCiAgICAgICAgMi9KeHlpU2d4S1dSZG9heSthTndNRzR3RGdZRFZSMFBBUUgvQkFRREFnRUdNQklHQTFVZEV3RUIvd1FJTUFZQgogICAgICAgIEFmOENBUUF3SFFZRFZSME9CQllFRkkxV25ycU1ZS2FISE9vK3pweWlpRHEycE8wS01Da0dBMVVkRVFRaU1DQ0MKICAgICAgICBIbWxrWlc1MGFYUjVMbXhwYm10bGNtUXVZMngxYzNSbGNpNXNiMk5oYkRBS0JnZ3Foa2pPUFFRREFnTkhBREJFCiAgICAgICAgQWlBdHVvSTVYdUN0ckdWUnpTbVJUbDJyYTI4YVY5TXlUVTdkNXFuVEFGSEtTZ0lnUktDdmx1T1NnQTVPMjFwNQogICAgICAgIDUxdGRybWtIRVpScjBxbExTSmRIWWdFZk16az0KICAgICAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgICAgIGtleVBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gRUMgUFJJVkFURSBLRVktLS0tLQogICAgICAgIE1IY0NBUUVFSUFBZThuZmJ6WnU5Yy9PQjIrOHhKTTBGejdOVXdUUWF6dWxrRk5zNFRJNStvQW9HQ0NxR1NNNDkKICAgICAgICBBd0VIb1VRRFFnQUUxL0ZwZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyCiAgICAgICAgZFF2UmFZYW51eEQzNkR0MTIvSnh5aVNneEtXUmRvYXkrUT09CiAgICAgICAgLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQppZGVudGl0eVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiAxME1pCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGNydFBFTTogcHJvZmlsZSB2YWxpZGF0b3IgY3J0CiAga2V5UEVNOiBwcm9maWxlIHZhbGlkYXRvciBrZXkKcHJvbWV0aGV1czoKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiAiNCIKICAgICAgcmVxdWVzdDogMzAwbQogICAgbWVtb3J5OgogICAgICBsaW1pdDogODE5Mk1pCiAgICAgIHJlcXVlc3Q6IDMwME1pCnByb3h5SW5qZWN0b3I6CiAgY2FCdW5kbGU6IHByb3h5IGluamVjdG9yIENBIGJ1bmRsZQogIGNydFBFTTogcHJveHkgaW5qZWN0b3IgY3J0CiAga2V5UEVNOiBwcm94eSBpbmplY3RvciBrZXkKcHJveHlJbmplY3RvclJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnB1YmxpY0FQSVJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCnNwVmFsaWRhdG9yUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKdGFwOgogIGNhQnVuZGxlOiB0YXAgQ0EgYnVuZGxlCiAgY3J0UEVNOiB0YXAgY3J0CiAga2V5UEVNOiB0YXAga2V5CnRhcFJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCndlYlJlc291cmNlczoKICBjcHU6CiAgICBsaW1pdDogIjEiCiAgICByZXF1ZXN0OiAxMDBtCiAgbWVtb3J5OgogICAgbGltaXQ6IDI1ME1pCiAgICByZXF1ZXN0OiA1ME1pCndlYmhvb2tGYWlsdXJlUG9saWN5OiBGYWlsCg== linkerd-config-overrides: Y29udHJvbGxlclJlcGxpY2FzOiAyCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgdmVyc2lvbjogaW5zdGFsbC1kZWJ1Zy12ZXJzaW9uCmRlc3RpbmF0aW9uUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKZW5hYmxlUG9kQW50aUFmZmluaXR5OiB0cnVlCmdsb2JhbDoKICBjb250cm9sbGVySW1hZ2VWZXJzaW9uOiBpbnN0YWxsLWNvbnRyb2wtcGxhbmUtdmVyc2lvbgogIGhpZ2hBdmFpbGFiaWxpdHk6IHRydWUKICBpZGVudGl0eVRydXN0QW5jaG9yc1BFTTogfAogICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgICBKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3SGhjTk1qQXdPREk0CiAgICBNRGN4TWpRM1doY05NekF3T0RJMk1EY3hNalEzV2pBcE1TY3dKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyCiAgICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgICBsMXZndzc5cmpCNXVTSVRJQ1VBNkd5ZnZTRmZjdUlpczdCL1hGU2trd0FIVTVTL3MxQUFQK1IwVFg3SEJXVUM0CiAgICB1YUc0V1dzaXdKS05uN21nbzNBd2JqQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCCiAgICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgICBhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUFvR0NDcUdTTTQ5QkFNQ0Ewa0FNRVlDCiAgICBJUUNON2xCRkxERHZqeDZWMCtYa2pwS0VSUnNKWWY1YWRNdm5sb0ZsNDhpbEpnSWhBTnR4aG5kY3IrUUpQdUM4CiAgICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgaW1hZ2VQdWxsU2VjcmV0czogbnVsbAogIHByb3h5OgogICAgaW1hZ2U6CiAgICAgIHZlcnNpb246IGluc3RhbGwtcHJveHktdmVyc2lvbgogICAgcmVzb3VyY2VzOgogICAgICBjcHU6CiAgICAgICAgcmVxdWVzdDogNDAwbQogICAgICBtZW1vcnk6CiAgICAgICAgbGltaXQ6IDI1ME1pCiAgICAgICAgcmVxdWVzdDogMzAwTWkKZ3JhZmFuYToKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiAiMSIKICAgICAgcmVxdWVzdDogMTAwbQogICAgbWVtb3J5OgogICAgICBsaW1pdDogMTAyNE1pCiAgICAgIHJlcXVlc3Q6IDUwTWkKaGVhcnRiZWF0UmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKaGVhcnRiZWF0U2NoZWR1bGU6IDEgMiAzIDQgNQppZGVudGl0eToKICBpc3N1ZXI6CiAgICBjcnRFeHBpcnk6ICIyMDMwLTA4LTI2VDA3OjEzOjQ3WiIKICAgIHRsczoKICAgICAgY3J0UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICAgICAgTUlJQndEQ0NBV2VnQXdJQkFnSVJBSlJJZ1o4UnRPOEV3ZzFYZXBmOFQ0NHdDZ1lJS29aSXpqMEVBd0l3S1RFbgogICAgICAgIE1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQjRYRFRJd01EZ3kKICAgICAgICBPREEzTVRNME4xb1hEVE13TURneU5qQTNNVE0wTjFvd0tURW5NQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1CiAgICAgICAgYTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFMS9GcAogICAgICAgIGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MmRRdlJhWWFudXhEMzZEdDEKICAgICAgICAyL0p4eWlTZ3hLV1Jkb2F5K2FOd01HNHdEZ1lEVlIwUEFRSC9CQVFEQWdFR01CSUdBMVVkRXdFQi93UUlNQVlCCiAgICAgICAgQWY4Q0FRQXdIUVlEVlIwT0JCWUVGSTFXbnJxTVlLYUhIT28renB5aWlEcTJwTzBLTUNrR0ExVWRFUVFpTUNDQwogICAgICAgIEhtbGtaVzUwYVhSNUxteHBibXRsY21RdVkyeDFjM1JsY2k1c2IyTmhiREFLQmdncWhrak9QUVFEQWdOSEFEQkUKICAgICAgICBBaUF0dW9JNVh1Q3RyR1ZSelNtUlRsMnJhMjhhVjlNeVRVN2Q1cW5UQUZIS1NnSWdSS0N2bHVPU2dBNU8yMXA1CiAgICAgICAgNTF0ZHJta0hFWlJyMHFsTFNKZEhZZ0VmTXprPQogICAgICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICAgICAga2V5UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCiAgICAgICAgTUhjQ0FRRUVJQUFlOG5mYnpadTljL09CMis4eEpNMEZ6N05Vd1RRYXp1bGtGTnM0VEk1K29Bb0dDQ3FHU000OQogICAgICAgIEF3RUhvVVFEUWdBRTEvRnBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzIKICAgICAgICBkUXZSYVlhbnV4RDM2RHQxMi9KeHlpU2d4S1dSZG9heStRPT0KICAgICAgICAtLS0tLUVORCBFQyBQUklWQVRFIEtFWS0tLS0tCmlkZW50aXR5UmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDEwTWkKcHJvZmlsZVZhbGlkYXRvcjoKICBjYUJ1bmRsZTogcHJvZmlsZSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgY3J0UEVNOiBwcm9maWxlIHZhbGlkYXRvciBjcnQKICBrZXlQRU06IHByb2ZpbGUgdmFsaWRhdG9yIGtleQpwcm9tZXRoZXVzOgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6ICI0IgogICAgICByZXF1ZXN0OiAzMDBtCiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiA4MTkyTWkKICAgICAgcmVxdWVzdDogMzAwTWkKcHJveHlJbmplY3RvcjoKICBjYUJ1bmRsZTogcHJveHkgaW5qZWN0b3IgQ0EgYnVuZGxlCiAgY3J0UEVNOiBwcm94eSBpbmplY3RvciBjcnQKICBrZXlQRU06IHByb3h5IGluamVjdG9yIGtleQpwcm94eUluamVjdG9yUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKcHVibGljQVBJUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKc3BWYWxpZGF0b3JSZXNvdXJjZXM6CiAgY3B1OgogICAgbGltaXQ6ICIxIgogICAgcmVxdWVzdDogMTAwbQogIG1lbW9yeToKICAgIGxpbWl0OiAyNTBNaQogICAgcmVxdWVzdDogNTBNaQp0YXA6CiAgY2FCdW5kbGU6IHRhcCBDQSBidW5kbGUKICBjcnRQRU06IHRhcCBjcnQKICBrZXlQRU06IHRhcCBrZXkKdGFwUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKd2ViUmVzb3VyY2VzOgogIGNwdToKICAgIGxpbWl0OiAiMSIKICAgIHJlcXVlc3Q6IDEwMG0KICBtZW1vcnk6CiAgICBsaW1pdDogMjUwTWkKICAgIHJlcXVlc3Q6IDUwTWkKd2ViaG9va0ZhaWx1cmVQb2xpY3k6IEZhaWwK
kind: Secret kind: Secret
metadata: metadata:
creationTimestamp: null creationTimestamp: null

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

@ -894,7 +894,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -979,7 +979,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1065,7 +1065,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1201,7 +1201,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1290,7 +1290,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1633,7 +1633,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1893,7 +1892,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2171,7 +2169,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2463,7 +2460,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2702,7 +2698,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2983,7 +2978,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3251,7 +3245,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3567,7 +3560,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -4008,7 +4000,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"

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

@ -898,7 +898,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -987,7 +987,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1077,7 +1077,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1217,7 +1217,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1310,7 +1310,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1657,7 +1657,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1921,7 +1920,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2203,7 +2201,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2503,7 +2500,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2746,7 +2742,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3031,7 +3026,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3303,7 +3297,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3623,7 +3616,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -4068,7 +4060,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"

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

@ -894,7 +894,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -979,7 +979,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1065,7 +1065,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1201,7 +1201,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1290,7 +1290,7 @@ data:
requireIdentityOnInboundPorts: "" requireIdentityOnInboundPorts: ""
resources: resources:
cpu: cpu:
limit: "1" limit: ""
request: 100m request: 100m
memory: memory:
limit: 250Mi limit: 250Mi
@ -1633,7 +1633,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -1893,7 +1892,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2171,7 +2169,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2463,7 +2460,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2702,7 +2698,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -2983,7 +2978,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3251,7 +3245,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -3567,7 +3560,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"
@ -4008,7 +4000,6 @@ spec:
initialDelaySeconds: 2 initialDelaySeconds: 2
resources: resources:
limits: limits:
cpu: "1"
memory: "250Mi" memory: "250Mi"
requests: requests:
cpu: "100m" cpu: "100m"

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

@ -241,7 +241,7 @@ func TestNewValues(t *testing.T) {
expected.Global.Proxy.Resources = &Resources{ expected.Global.Proxy.Resources = &Resources{
CPU: Constraints{ CPU: Constraints{
Limit: controllerResources.CPU.Limit, Limit: "",
Request: controllerResources.CPU.Request, Request: controllerResources.CPU.Request,
}, },
Memory: Constraints{ Memory: Constraints{