Repository: linkerd/linkerd2
Pull request #6775 (2021-08-30 17:02:39)

build(deps-dev): bump eslint-plugin-react from 7.24.0 to 7.25.1 in /web/app
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.24.0 to 7.25.1.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md">eslint-plugin-react's changelog</a>.</em></p>
<blockquote>
<h2><a href="https://github.com/yannickcr/eslint-plugin-react/compare/v7.25.0...v7.25.1">7.25.1</a> - 2021.08.29</h2>
<h3>Fixed</h3>
<ul>
<li>[<code>no-this-in-sfc</code>], component detection: Improve stateless component detection (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3056">#3056</a>[] <a href="https://github.com/Wesitos"><code>@​Wesitos</code></a>)</li>
</ul>
<p><a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3056">#3056</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/pull/3056">yannickcr/eslint-plugin-react#3056</a></p>
<h2><a href="https://github.com/yannickcr/eslint-plugin-react/compare/v7.24.0...v7.25.0">7.25.0</a> - 2021.08.27</h2>
<h3>Added</h3>
<ul>
<li>[<code>jsx-no-useless-fragments</code>]: add option to allow single expressions in fragments (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3006">#3006</a>[] <a href="https://github.com/mattdarveniza"><code>@​mattdarveniza</code></a>)</li>
<li>add [<code>prefer-exact-props</code>] rule (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/1547">#1547</a>[] <a href="https://github.com/jomasti"><code>@​jomasti</code></a>)</li>
<li>[<code>jsx-no-target-blank</code>]: add <code>forms</code> option (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/1617">#1617</a>[] <a href="https://github.com/jaaberg"><code>@​jaaberg</code></a>)</li>
<li>[<code>jsx-pascal-case</code>]: add <code>allowLeadingUnderscore</code> option (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3039">#3039</a>[] <a href="https://github.com/pangaeatech"><code>@​pangaeatech</code></a>)</li>
<li>[<code>no-children-prop</code>]: Add <code>allowFunctions</code> option (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/1903">#1903</a>[] <a href="https://github.com/alexzherdev"><code>@​alexzherdev</code></a>)</li>
<li>[<code>jsx-runtime</code>]: set <code>parserOptions.jsxPragma</code> for <code>@typescript-eslint/parser</code> (<a href="https://github.com/yannickcr/eslint-plugin-react/commit/bb64df6505b3e9a01da5b61626ab9f544caea438">bb64df65</a> <a href="https://github.com/ljharb"><code>@​ljharb</code></a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>component detection: use <code>estraverse</code> to improve component detection (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/2992">#2992</a>[] <a href="https://github.com/Wesitos"><code>@​Wesitos</code></a>)</li>
<li>[<code>destructuring-assignment</code>], [<code>no-multi-comp</code>], [<code>no-unstable-nested-components</code>], component detection: improve component detection (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3001">#3001</a>[] <a href="https://github.com/vedadeepta"><code>@​vedadeepta</code></a>)</li>
<li>[<code>no-deprecated</code>]: fix crash on rest elements (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3016">#3016</a>[] <a href="https://github.com/ljharb"><code>@​ljharb</code></a>)</li>
<li>[<code>destructuring-assignment</code>]: get the contextName correctly (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3025">#3025</a>[] <a href="https://github.com/ohhoney1"><code>@​ohhoney1</code></a>)</li>
<li>[<code>no-typos</code>]: prevent crash on styled components and forwardRefs (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3036">#3036</a>[] <a href="https://github.com/ljharb"><code>@​ljharb</code></a>)</li>
<li>[<code>destructuring-assignment</code>], component detection: handle default exports edge case (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3038">#3038</a>[] <a href="https://github.com/vedadeepta"><code>@​vedadeepta</code></a>)</li>
<li>[<code>no-typos</code>]: fix crash on private methods (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3043">#3043</a>[] <a href="https://github.com/ljharb"><code>@​ljharb</code></a>)</li>
<li>[<code>jsx-no-bind</code>]: handle local function declarations (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3048">#3048</a>[] <a href="https://github.com/p7g"><code>@​p7g</code></a>)</li>
<li>[<code>prop-types</code>], <code>propTypes</code>: handle React.* TypeScript types (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3049">#3049</a>[] <a href="https://github.com/vedadeepta"><code>@​vedadeepta</code></a>)</li>
<li>[<code>prop-types</code>], <code>propTypes</code>: add handling for <code>FC&lt;Props&gt;</code>, improve tests (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3051">#3051</a>[] <a href="https://github.com/vedadeepta"><code>@​vedadeepta</code></a>)</li>
<li>[<code>prop-types</code>], <code>propTypes</code>: prevent crash introduced in <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3051">#3051</a>[] (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3053">#3053</a>[] <a href="https://github.com/ljharb"><code>@​ljharb</code></a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>[Docs] [<code>jsx-no-bind</code>]: updates discussion of refs (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/2998">#2998</a>[] <a href="https://github.com/dimitropoulos"><code>@​dimitropoulos</code></a>)</li>
<li>[Refactor] <code>utils/Components</code>: correct spelling and delete unused code (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3026">#3026</a>[] <a href="https://github.com/ohhoney1"><code>@​ohhoney1</code></a>)</li>
<li>[Docs] [<code>jsx-uses-react</code>], [<code>react-in-jsx-scope</code>]: document [<code>react/jsx-runtime</code>] config (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3018">#3018</a>[] <a href="https://github.com/pkuczynski"><code>@​pkuczynski</code></a> <a href="https://github.com/ljharb"><code>@​ljharb</code></a>)</li>
<li>[Docs] [<code>require-default-props</code>]: fix small typo (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/2994">#2994</a>[] <a href="https://github.com/evsasse"><code>@​evsasse</code></a>)</li>
<li>[Tests] add weekly scheduled smoke tests (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/2963">#2963</a>[] <a href="https://github.com/AriPerkkio"><code>@​AriPerkkio</code></a>)</li>
<li>[Docs] improve instructions for <code>jsx-runtime</code> config (<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3052">#3052</a>[] <a href="https://github.com/ljharb"><code>@​ljharb</code></a>)</li>
</ul>
<p><a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3053">#3053</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3053">yannickcr/eslint-plugin-react#3053</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3052">#3052</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3052">yannickcr/eslint-plugin-react#3052</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3051">#3051</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/pull/3051">yannickcr/eslint-plugin-react#3051</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3049">#3049</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/pull/3049">yannickcr/eslint-plugin-react#3049</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3048">#3048</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/pull/3048">yannickcr/eslint-plugin-react#3048</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3043">#3043</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3043">yannickcr/eslint-plugin-react#3043</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3039">#3039</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/pull/3039">yannickcr/eslint-plugin-react#3039</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3038">#3038</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/pull/3038">yannickcr/eslint-plugin-react#3038</a>
<a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3036">#3036</a>: <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3036">yannickcr/eslint-plugin-react#3036</a></p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/9487a1789e5153f6a2a6cd46958f2e7e92ae7457"><code>9487a17</code></a> Update CHANGELOG and bump version</li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/179550babbe3621bd857bb3b8b7910a5fc968c96"><code>179550b</code></a> [Fix] <code>no-this-in-sfc</code>, component detection: Improve stateless component dete...</li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/261d93afe76dbd03056877af3b3a47e1c7760306"><code>261d93a</code></a> Update CHANGELOG and bump version</li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/4b509afda0188edfa0909d779b79a9ac01aab2cd"><code>4b509af</code></a> [Fix] <code>prop-types</code>, <code>propTypes</code>: prevent crash introduced in <a href="https://github-redirect.dependabot.com/yannickcr/eslint-plugin-react/issues/3051">#3051</a></li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/6f78b757bfd3bbf1d57a5a7e9d2218141040fb61"><code>6f78b75</code></a> [Dev Deps] update <code>eslint-plugin-import</code></li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/eb5f0d572bf5509b99dbb889202078a3785cfd02"><code>eb5f0d5</code></a> [meta] update sha</li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/bb64df6505b3e9a01da5b61626ab9f544caea438"><code>bb64df6</code></a> [New] <code>jsx-runtime</code>: set <code>parserOptions.jsxPragma</code> for `@typescript-eslint/pa...</li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/130afb11335615aec623577b7e3ad33de2b9abec"><code>130afb1</code></a> [Fix] <code>prop-types</code>, <code>propTypes</code>: add handling for <code>FC\&lt;Props&gt;</code>, improve tests</li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/77813f04e447f48239c9689de1e7043b118e3d43"><code>77813f0</code></a> [Docs] improve instructions for <code>jsx-runtime</code> config</li>
<li><a href="https://github.com/yannickcr/eslint-plugin-react/commit/d74a7d82d92ba984f7bcbf62d7ebe9272b3d5154"><code>d74a7d8</code></a> [Fix] <code>prop-types</code>, <code>propTypes</code>: handle React.* TypeScript types</li>
<li>Additional commits viewable in <a href="https://github.com/yannickcr/eslint-plugin-react/compare/v7.24.0...v7.25.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=eslint-plugin-react&package-manager=npm_and_yarn&previous-version=7.24.0&new-version=7.25.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>


Patch:
diff --git a/.gitattributes b/.gitattributes
index b8c97f717..2d9972fcb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,8 @@
-# By default, collapse for these files in GitHub reviews.
+# Expand these files in PRs:
 go.sum linguist-generated=false
+**/Cargo.lock linguist-generated=false
+# Collapse these files in PRs:
 controller/gen/**/*.pb.go linguist-generated=true
 **/*.golden linguist-generated=true
+**/*.golden.yml linguist-generated=true
+controller/proxy-injector/fake/data/* linguist-generated=true
diff --git a/charts/linkerd2/templates/identity.yaml b/charts/linkerd2/templates/identity.yaml
index 6bdc18bec..591ce8534 100644
--- a/charts/linkerd2/templates/identity.yaml
+++ b/charts/linkerd2/templates/identity.yaml
@@ -191,6 +191,12 @@ spec:
       {{- $_ := set $tree.Values.proxy "await" false }}
       {{- $_ := set $tree.Values.proxy "loadTrustBundleFromConfigMap" true }}
       {{- $_ := set $tree.Values.proxy "podInboundPorts" "8080,9990" }}
+      {{- /*
+        The identity controller cannot discover policies, so we configure it with defaults that
+        enforce TLS on the identity service.
+      */}}
+      {{- $_ := set $tree.Values.proxy "defaultInboundPolicy" "cluster-unauthenticated" }}
+      {{- $_ := set $tree.Values.proxy "requireTLSOnInboundPorts" "8080" }}
       - {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
       {{ if not .Values.cniEnabled -}}
       initContainers:
diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl
index 1ce5a6d2c..6f028359b 100644
--- a/charts/partials/templates/_proxy.tpl
+++ b/charts/partials/templates/_proxy.tpl
@@ -21,6 +21,10 @@ env:
 - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_IDENTITY
   value: {{.Values.proxy.requireIdentityOnInboundPorts | quote}}
 {{ end -}}
+{{ if .Values.proxy.requireTLSOnInboundPorts -}}
+- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+  value: {{.Values.proxy.requireTLSOnInboundPorts | quote}}
+{{ end -}}
 - name: LINKERD2_PROXY_LOG
   value: {{.Values.proxy.logLevel | quote}}
 - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/policy-controller/Cargo.lock b/policy-controller/Cargo.lock
index cc8fdda49..8304ae0a8 100644
--- a/policy-controller/Cargo.lock
+++ b/policy-controller/Cargo.lock
@@ -1588,9 +1588,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
+checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"
 dependencies = [
  "indexmap",
  "itoa",
diff --git a/web/app/package.json b/web/app/package.json
index 0ec150831..755c1587a 100644
--- a/web/app/package.json
+++ b/web/app/package.json
@@ -64,7 +64,7 @@
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react": "^7.25.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-webpack-plugin": "^3.0.1",
     "file-loader": "^6.2.0",
diff --git a/web/app/yarn.lock b/web/app/yarn.lock
index e86482d05..014fe0b8c 100644
--- a/web/app/yarn.lock
+++ b/web/app/yarn.lock
@@ -4004,14 +4004,15 @@ eslint-plugin-react-hooks@^4.2.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
   integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
 
-eslint-plugin-react@^7.23.1:
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
-  integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
+eslint-plugin-react@^7.25.1:
+  version "7.25.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz#9286b7cd9bf917d40309760f403e53016eda8331"
+  integrity sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==
   dependencies:
     array-includes "^3.1.3"
     array.prototype.flatmap "^1.2.4"
     doctrine "^2.1.0"
+    estraverse "^5.2.0"
     has "^1.0.3"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.0.4"


Test patch:
diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden
index 212374028..0ba07fb84 100644
--- a/cli/cmd/testdata/install_controlplane_tracing_output.golden
+++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden
@@ -1371,6 +1371,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden
index 06e7f4665..1bc3f9be5 100644
--- a/cli/cmd/testdata/install_custom_domain.golden
+++ b/cli/cmd/testdata/install_custom_domain.golden
@@ -1370,6 +1370,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden
index bace48ce8..de46e265c 100644
--- a/cli/cmd/testdata/install_custom_registry.golden
+++ b/cli/cmd/testdata/install_custom_registry.golden
@@ -1370,6 +1370,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden
index 519931324..804dcd2cb 100644
--- a/cli/cmd/testdata/install_default.golden
+++ b/cli/cmd/testdata/install_default.golden
@@ -1370,6 +1370,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden
index 1d409daf3..4d729b1d2 100644
--- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden
+++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden
@@ -1370,6 +1370,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden
index 4a29b59ac..019f69b0a 100644
--- a/cli/cmd/testdata/install_ha_output.golden
+++ b/cli/cmd/testdata/install_ha_output.golden
@@ -1439,6 +1439,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden
index 541034ac3..694737680 100644
--- a/cli/cmd/testdata/install_ha_with_overrides_output.golden
+++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden
@@ -1439,6 +1439,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden
index d1726edfc..72be96dba 100644
--- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden
+++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden
@@ -1301,6 +1301,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_helm_output.golden b/cli/cmd/testdata/install_helm_output.golden
index 69fd5b282..bbda8d079 100644
--- a/cli/cmd/testdata/install_helm_output.golden
+++ b/cli/cmd/testdata/install_helm_output.golden
@@ -1361,6 +1361,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_helm_output_ha.golden b/cli/cmd/testdata/install_helm_output_ha.golden
index 9ab694c01..f683ed61c 100644
--- a/cli/cmd/testdata/install_helm_output_ha.golden
+++ b/cli/cmd/testdata/install_helm_output_ha.golden
@@ -1430,6 +1430,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden
index 631f36f77..cdd362309 100644
--- a/cli/cmd/testdata/install_helm_output_ha_labels.golden
+++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden
@@ -1438,6 +1438,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden
index 7be0b434e..969b948ce 100644
--- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden
+++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden
@@ -1430,6 +1430,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden
index 788820659..8f82bb89d 100644
--- a/cli/cmd/testdata/install_no_init_container.golden
+++ b/cli/cmd/testdata/install_no_init_container.golden
@@ -1370,6 +1370,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden
index a0d6e8feb..4c7efcd6a 100644
--- a/cli/cmd/testdata/install_output.golden
+++ b/cli/cmd/testdata/install_output.golden
@@ -1370,6 +1370,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden
index 678bd573f..e0b473edc 100644
--- a/cli/cmd/testdata/install_proxy_ignores.golden
+++ b/cli/cmd/testdata/install_proxy_ignores.golden
@@ -1370,6 +1370,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT
diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden
index f32215c17..741341c44 100644
--- a/cli/cmd/testdata/install_values_file.golden
+++ b/cli/cmd/testdata/install_values_file.golden
@@ -1356,6 +1356,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
+          value: "8080"
         - name: LINKERD2_PROXY_LOG
           value: "warn,linkerd=info"
         - name: LINKERD2_PROXY_LOG_FORMAT