From dec365cb9205d5771a52865d08561565df37f99b Mon Sep 17 00:00:00 2001
From: Aaron Friel <mayreply@aaronfriel.com>
Date: Mon, 3 Jan 2022 17:31:42 -0800
Subject: [PATCH] proxy injector, multicluster: use health check port

Related to https://github.com/linkerd/linkerd2/issues/7560, this
modifies the proxy injector to use port 4192 and updates the
multicluster manifest to match.

See: https://github.com/linkerd/linkerd2-proxy/pull/1428

Signed-off-by: Aaron Friel <mayreply@aaronfriel.com>
---
 charts/partials/templates/_proxy.tpl                      | 8 ++++++--
 controller/proxy-injector/fake/data/pod.patch.json        | 8 ++++++--
 multicluster/charts/linkerd-multicluster-link/values.yaml | 2 +-
 multicluster/charts/linkerd-multicluster/values.yaml      | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl
index 9a4acbabf0a3f..05665456d0113 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:
@@ -142,10 +144,12 @@ ports:
   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 }}
diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json
index dbbd771204010..326ad505323c1 100644
--- a/controller/proxy-injector/fake/data/pod.patch.json
+++ b/controller/proxy-injector/fake/data/pod.patch.json
@@ -169,6 +169,10 @@
           "name": "LINKERD2_PROXY_ADMIN_LISTEN_ADDR",
           "value": "0.0.0.0:4191"
         },
+        {
+          "name": "LINKERD2_PROXY_HEALTH_LISTEN_ADDR",
+          "value": "0.0.0.0:4192"
+        },
         {
           "name": "LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR",
           "value": "127.0.0.1:4140"
@@ -228,7 +232,7 @@
       "livenessProbe": {
         "httpGet": {
           "path": "/live",
-          "port": 4191
+          "port": 4192
         },
         "initialDelaySeconds": 10
       },
@@ -246,7 +250,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 52d330dc753d3..3d2d141a5a570 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