Skip to content

Commit

Permalink
proxy injector, multicluster: use health check port
Browse files Browse the repository at this point in the history
Related to linkerd#7560, this
modifies the proxy injector to use port 4192 and updates the
multicluster manifest to match.

See: linkerd/linkerd2-proxy#1428

Signed-off-by: Aaron Friel <[email protected]>
  • Loading branch information
AaronFriel committed Jan 23, 2022
1 parent 8a9e4de commit a0ab0df
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
8 changes: 6 additions & 2 deletions charts/partials/templates/_proxy.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ env:
value: 0.0.0.0:{{.Values.proxy.ports.control}}
- name: LINKERD2_PROXY_ADMIN_LISTEN_ADDR
value: 0.0.0.0:{{.Values.proxy.ports.admin}}
- name: LINKERD2_PROXY_HEALTH_LISTEN_ADDR
value: 0.0.0.0:4192
- name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR
value: 127.0.0.1:{{.Values.proxy.ports.outbound}}
- name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR
Expand Down Expand Up @@ -134,18 +136,20 @@ imagePullPolicy: {{.Values.proxy.image.pullPolicy | default .Values.imagePullPol
livenessProbe:
httpGet:
path: /live
port: {{.Values.proxy.ports.admin}}
port: 4192
initialDelaySeconds: 10
name: linkerd-proxy
ports:
- containerPort: {{.Values.proxy.ports.inbound}}
name: linkerd-proxy
- containerPort: {{.Values.proxy.ports.admin}}
name: linkerd-admin
- containerPort: 4192
name: linkerd-health
readinessProbe:
httpGet:
path: /ready
port: {{.Values.proxy.ports.admin}}
port: 4192
initialDelaySeconds: 2
{{- if .Values.proxy.resources }}
{{ include "partials.resources" .Values.proxy.resources }}
Expand Down
8 changes: 6 additions & 2 deletions controller/proxy-injector/fake/data/pod.patch.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster-link/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ enableHeadlessServices: false
gateway:
probe:
# -- The port used for liveliness probing
port: 4191
port: 4192
# -- Log level for the Multicluster components
logLevel: info
# -- Number of times update from the remote cluster is allowed to be requeued
Expand Down
2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ gateway:
# gateway is alive
path: /ready
# -- The port used for liveliness probing
port: 4191
port: 4192
# nodePort -- Set the probe nodePort (for LoadBalancer or NodePort) to a specific value
# nodePort:
# -- The interval (in seconds) between liveness probes
Expand Down

0 comments on commit a0ab0df

Please sign in to comment.