diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index 9a4acbabf0a3f..79ed222530b26 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -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 @@ -134,7 +136,7 @@ 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: @@ -145,7 +147,7 @@ ports: readinessProbe: httpGet: path: /ready - port: {{.Values.proxy.ports.admin}} + port: 4192 initialDelaySeconds: 2 {{- if .Values.proxy.resources }} {{ include "partials.resources" .Values.proxy.resources }} diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index dbbd771204010..ffdd5fd576020 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -228,7 +228,7 @@ "livenessProbe": { "httpGet": { "path": "/live", - "port": 4191 + "port": 4192 }, "initialDelaySeconds": 10 }, @@ -246,7 +246,7 @@ "readinessProbe": { "httpGet": { "path": "/ready", - "port": 4191 + "port": 4192 }, "initialDelaySeconds": 2 }, diff --git a/multicluster/charts/linkerd-multicluster-link/values.yaml b/multicluster/charts/linkerd-multicluster-link/values.yaml index a0879f6d2e053..e80b9aea8b793 100644 --- a/multicluster/charts/linkerd-multicluster-link/values.yaml +++ b/multicluster/charts/linkerd-multicluster-link/values.yaml @@ -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 diff --git a/multicluster/charts/linkerd-multicluster/values.yaml b/multicluster/charts/linkerd-multicluster/values.yaml index fb543289ac43b..a586e5f1e00e5 100644 --- a/multicluster/charts/linkerd-multicluster/values.yaml +++ b/multicluster/charts/linkerd-multicluster/values.yaml @@ -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