Repository: linkerd/linkerd2
Pull request #5067 (2020-10-12 22:34:10)

Remove install, global, and proxy fields from config entirely
Remove the now unused `global`, `install`, and `proxy` fields from the `linkerd-config` configmap.

Signed-off-by: Alex Leong <alex@buoyant.io>

<!--  Thanks for sending a pull request!

If you already have a well-structured git commit message, chances are GitHub
set the title and description of this PR to the git commit message subject and
body, respectively. If so, you may delete these instructions and submit your PR.

If this is your first time, please read our contributor guide:
https://github.com/linkerd/linkerd2/blob/main/CONTRIBUTING.md

The title and description of your Pull Request should match the git commit
subject and body, respectively. Git commit messages are structured as follows:

```
Subject

Problem

Solution

Validation

Fixes #[GitHub issue ID]

DCO Sign off
```

Example git commit message:

```
Introduce Pull Request Template

GitHub's community guidelines recommend a pull request template, the repo was
lacking one.

Introduce a `PULL_REQUEST_TEMPLATE.md` file.

Once merged, the
[Community profile checklist](https://github.com/linkerd/linkerd2/community)
should indicate the repo now provides a pull request template.

Fixes #3321

Signed-off-by: Jane Smith <jane.smith@example.com>
```

Note the git commit message subject becomes the pull request title.

For more details around git commits, see the section on Committing in our
contributor guide:
https://github.com/linkerd/linkerd2/blob/main/CONTRIBUTING.md#committing
-->



Patch:
diff --git a/charts/linkerd2-multicluster/README.md b/charts/linkerd2-multicluster/README.md
index 9eaf18945..04c9c1e48 100644
--- a/charts/linkerd2-multicluster/README.md
+++ b/charts/linkerd2-multicluster/README.md
@@ -38,3 +38,4 @@ linkerd2-multicluster chart and their default values.
 |`logLevel`                       | Log level for the Multicluster components                                                   |`info`                                        |
 |`serviceMirrorRetryLimit`        | Number of times update from the remote cluster is allowed to be requeued (retried)          |`3`                                           |
 |`serviceMirrorUID`               | User id under which the Service Mirror shall be ran                                         |`2103`                                        |
+|`loadBalancerIP`               | Request a specific IP address for the gateway service (e.g. use an IP address you have reserved)                                  |emptyString                                        |
diff --git a/charts/linkerd2-multicluster/templates/gateway.yaml b/charts/linkerd2-multicluster/templates/gateway.yaml
index c540b20c5..4cac56680 100644
--- a/charts/linkerd2-multicluster/templates/gateway.yaml
+++ b/charts/linkerd2-multicluster/templates/gateway.yaml
@@ -133,6 +133,9 @@ spec:
   selector:
     app: {{.Values.gatewayName}}
   type: LoadBalancer
+{{- if .Values.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.loadBalancerIP }}
+{{- end }}
 ---
 kind: ServiceAccount
 apiVersion: v1
diff --git a/charts/linkerd2/templates/_config.tpl b/charts/linkerd2/templates/_config.tpl
deleted file mode 100644
index 39f3ce805..000000000
--- a/charts/linkerd2/templates/_config.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-{{- define "linkerd.configs.global" -}}
-{
-  "linkerdNamespace": "{{.Values.global.namespace}}",
-  "cniEnabled": {{ default false .Values.global.cniEnabled }},
-  "version": "{{.Values.global.linkerdVersion}}",
-  "identityContext":{
-    "trustDomain": "{{.Values.global.identityTrustDomain}}",
-    "trustAnchorsPem": "{{required "Please provide the identity trust anchors" .Values.global.identityTrustAnchorsPEM | trim | replace "\n" "\\n"}}",
-    "issuanceLifetime": "{{.Values.identity.issuer.issuanceLifetime}}",
-    "clockSkewAllowance": "{{.Values.identity.issuer.clockSkewAllowance}}",
-    "scheme": "{{.Values.identity.issuer.scheme}}"
-  },
-  "autoInjectContext": null,
-  "omitWebhookSideEffects": {{.Values.omitWebhookSideEffects}},
-  "clusterDomain": "{{.Values.global.clusterDomain}}"
-}
-{{- end -}}
-
-{{- define "linkerd.configs.proxy" -}}
-{
-  "proxyImage":{
-    "imageName":"{{.Values.global.proxy.image.name}}",
-    "pullPolicy":"{{.Values.global.proxy.image.pullPolicy}}"
-  },
-  "proxyInitImage":{
-    "imageName":"{{.Values.global.proxyInit.image.name}}",
-    "pullPolicy":"{{.Values.global.proxyInit.image.pullPolicy}}"
-  },
-  "controlPort":{
-    "port": {{.Values.global.proxy.ports.control}}
-  },
-  "ignoreInboundPorts":[
-    {{- include "partials.splitStringListToPortRanges" .Values.global.proxyInit.ignoreInboundPorts -}}
-  ],
-  "ignoreOutboundPorts":[
-    {{- include "partials.splitStringListToPortRanges" .Values.global.proxyInit.ignoreOutboundPorts -}}
-  ],
-  "inboundPort":{
-    "port": {{.Values.global.proxy.ports.inbound}}
-  },
-  "adminPort":{
-    "port": {{.Values.global.proxy.ports.admin}}
-  },
-  "outboundPort":{
-    "port": {{.Values.global.proxy.ports.outbound}}
-  },
-  "resource":{
-    "requestCpu": "{{.Values.global.proxy.resources.cpu.request}}",
-    "limitCpu": "{{.Values.global.proxy.resources.cpu.limit}}",
-    "requestMemory": "{{.Values.global.proxy.resources.memory.request}}",
-    "limitMemory": "{{.Values.global.proxy.resources.memory.limit}}"
-  },
-  "proxyUid": {{.Values.global.proxy.uid}},
-  "logLevel":{
-    "level": "{{.Values.global.proxy.logLevel}}"
-  },
-  "logFormat": "{{.Values.global.proxy.logFormat}}",
-  "disableExternalProfiles": {{not .Values.global.proxy.enableExternalProfiles}},
-  "proxyVersion": "{{.Values.global.proxy.image.version}}",
-  "proxyInitImageVersion": "{{.Values.global.proxyInit.image.version}}",
-  "debugImage":{
-    "imageName":"{{.Values.debugContainer.image.name}}",
-    "pullPolicy":"{{.Values.debugContainer.image.pullPolicy}}"
-  },
-  "debugImageVersion": "{{.Values.debugContainer.image.version}}",
-  "destinationGetNetworks": "{{.Values.global.proxy.destinationGetNetworks}}",
-  "outboundConnectTimeout": "{{.Values.global.proxy.outboundConnectTimeout}}",
-  "inboundConnectTimeout": "{{.Values.global.proxy.inboundConnectTimeout}}"
-}
-{{- end -}}
-
-{{- define "linkerd.configs.install" -}}
-{
-  "cliVersion":"{{ .Values.global.linkerdVersion }}",
-  "flags":[
-  {{- if .Values.disableHeartBeat -}}
-  {"name": "disable-heartbeat", "value": "true"}
-  {{- end -}}
-  ]
-}
-{{- end -}}
diff --git a/charts/linkerd2/templates/config.yaml b/charts/linkerd2/templates/config.yaml
index d8130d921..ef3eb0c1a 100644
--- a/charts/linkerd2/templates/config.yaml
+++ b/charts/linkerd2/templates/config.yaml
@@ -10,30 +10,6 @@ metadata:
   annotations:
     {{.Values.global.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.global.linkerdVersion) .Values.global.cliVersion}}
 data:
-  global: |
-  {{- if .Values.configs -}}
-  {{- if .Values.configs.global -}}
-  {{.Values.configs.global | nindent 4}}
-  {{- end }}
-  {{- else -}}
-  {{- include "linkerd.configs.global" . | nindent 4}}
-  {{- end }}
-  proxy: |
-  {{- if .Values.configs -}}
-  {{- if .Values.configs.proxy -}}
-  {{.Values.configs.proxy | nindent 4}}
-  {{- end }}
-  {{- else -}}
-  {{- include "linkerd.configs.proxy" . | nindent 4}}
-  {{- end }}
-  install: |
-  {{- if .Values.configs -}}
-  {{- if .Values.configs.install -}}
-  {{.Values.configs.install | nindent 4}}
-  {{- end }}
-  {{- else -}}
-  {{- include "linkerd.configs.install" . | nindent 4}}
-  {{- end }}
   values: |
   {{- $values := deepCopy .Values }}
   {{- /*
diff --git a/cli/cmd/install.go b/cli/cmd/install.go
index 18f7c1256..cd8ab9aa3 100644
--- a/cli/cmd/install.go
+++ b/cli/cmd/install.go
@@ -72,7 +72,6 @@ var (
 	}
 
 	templatesControlPlaneStage = []string{
-		"templates/_config.tpl",
 		"templates/_helpers.tpl",
 		"templates/config.yaml",
 		"templates/identity.yaml",


Test patch:
diff --git a/cli/cmd/testdata/install_addon.golden b/cli/cmd/testdata/install_addon.golden
index fba0ef8fe..6caf51d36 100644
--- a/cli/cmd/testdata/install_addon.golden
+++ b/cli/cmd/testdata/install_addon.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden
index b91c3e727..55f630699 100644
--- a/cli/cmd/testdata/install_controlplane_tracing_output.golden
+++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden
index d24c046dd..a7d90b425 100644
--- a/cli/cmd/testdata/install_custom_registry.golden
+++ b/cli/cmd/testdata/install_custom_registry.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: my.custom.registry/linkerd-io/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden
index e66d3f96a..f2336aa6b 100644
--- a/cli/cmd/testdata/install_default.golden
+++ b/cli/cmd/testdata/install_default.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
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 998ac9288..42c84c849 100644
--- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden
+++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_grafana_existing.golden b/cli/cmd/testdata/install_grafana_existing.golden
index bb3b38f84..a6b9ba518 100644
--- a/cli/cmd/testdata/install_grafana_existing.golden
+++ b/cli/cmd/testdata/install_grafana_existing.golden
@@ -795,9 +795,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden
index 149f46080..59b58a1e5 100644
--- a/cli/cmd/testdata/install_ha_output.golden
+++ b/cli/cmd/testdata/install_ha_output.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden
index 0a6a73687..2c4ea4c05 100644
--- a/cli/cmd/testdata/install_ha_with_overrides_output.golden
+++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden
index 298cc764f..9a67db09d 100644
--- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden
+++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden
@@ -754,9 +754,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_helm_output.golden b/cli/cmd/testdata/install_helm_output.golden
index b60a8c4da..2035113b9 100644
--- a/cli/cmd/testdata/install_helm_output.golden
+++ b/cli/cmd/testdata/install_helm_output.golden
@@ -824,74 +824,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/helm linkerd-version
 data:
-  global: |
-    {
-      "linkerdNamespace": "linkerd",
-      "cniEnabled": false,
-      "version": "linkerd-version",
-      "identityContext":{
-        "trustDomain": "test.trust.domain",
-        "trustAnchorsPem": "test-trust-anchor",
-        "issuanceLifetime": "24h0m0s",
-        "clockSkewAllowance": "20s",
-        "scheme": "linkerd.io/tls"
-      },
-      "autoInjectContext": null,
-      "omitWebhookSideEffects": false,
-      "clusterDomain": "cluster.local"
-    }
-  proxy: |
-    {
-      "proxyImage":{
-        "imageName":"ghcr.io/linkerd/proxy",
-        "pullPolicy":"IfNotPresent"
-      },
-      "proxyInitImage":{
-        "imageName":"ghcr.io/linkerd/proxy-init",
-        "pullPolicy":"IfNotPresent"
-      },
-      "controlPort":{
-        "port": 4190
-      },
-      "ignoreInboundPorts":[{"portRange":"222"}],
-      "ignoreOutboundPorts":[{"portRange":"111"}],
-      "inboundPort":{
-        "port": 4143
-      },
-      "adminPort":{
-        "port": 4191
-      },
-      "outboundPort":{
-        "port": 4140
-      },
-      "resource":{
-        "requestCpu": "",
-        "limitCpu": "",
-        "requestMemory": "",
-        "limitMemory": ""
-      },
-      "proxyUid": 2102,
-      "logLevel":{
-        "level": "warn,linkerd=info"
-      },
-      "logFormat": "plain",
-      "disableExternalProfiles": true,
-      "proxyVersion": "test-proxy-version",
-      "proxyInitImageVersion": "test-proxy-init-version",
-      "debugImage":{
-        "imageName":"ghcr.io/linkerd/debug",
-        "pullPolicy":"IfNotPresent"
-      },
-      "debugImageVersion": "test-debug-version",
-      "destinationGetNetworks": "10.0.0.0/8,172.16.0.0/12,192.168.0.0/16",
-      "outboundConnectTimeout": "1000ms",
-      "inboundConnectTimeout": "100ms"
-    }
-  install: |
-    {
-      "cliVersion":"linkerd-version",
-      "flags":[]
-    }
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: dev-undefined
diff --git a/cli/cmd/testdata/install_helm_output_addons.golden b/cli/cmd/testdata/install_helm_output_addons.golden
index 72792f8ff..707ade76c 100644
--- a/cli/cmd/testdata/install_helm_output_addons.golden
+++ b/cli/cmd/testdata/install_helm_output_addons.golden
@@ -824,74 +824,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/helm linkerd-version
 data:
-  global: |
-    {
-      "linkerdNamespace": "linkerd",
-      "cniEnabled": false,
-      "version": "linkerd-version",
-      "identityContext":{
-        "trustDomain": "test.trust.domain",
-        "trustAnchorsPem": "test-trust-anchor",
-        "issuanceLifetime": "24h0m0s",
-        "clockSkewAllowance": "20s",
-        "scheme": "linkerd.io/tls"
-      },
-      "autoInjectContext": null,
-      "omitWebhookSideEffects": false,
-      "clusterDomain": "cluster.local"
-    }
-  proxy: |
-    {
-      "proxyImage":{
-        "imageName":"ghcr.io/linkerd/proxy",
-        "pullPolicy":"IfNotPresent"
-      },
-      "proxyInitImage":{
-        "imageName":"ghcr.io/linkerd/proxy-init",
-        "pullPolicy":"IfNotPresent"
-      },
-      "controlPort":{
-        "port": 4190
-      },
-      "ignoreInboundPorts":[{"portRange":"222"}],
-      "ignoreOutboundPorts":[{"portRange":"111"}],
-      "inboundPort":{
-        "port": 4143
-      },
-      "adminPort":{
-        "port": 4191
-      },
-      "outboundPort":{
-        "port": 4140
-      },
-      "resource":{
-        "requestCpu": "",
-        "limitCpu": "",
-        "requestMemory": "",
-        "limitMemory": ""
-      },
-      "proxyUid": 2102,
-      "logLevel":{
-        "level": "warn,linkerd=info"
-      },
-      "logFormat": "plain",
-      "disableExternalProfiles": true,
-      "proxyVersion": "test-proxy-version",
-      "proxyInitImageVersion": "test-proxy-init-version",
-      "debugImage":{
-        "imageName":"ghcr.io/linkerd/debug",
-        "pullPolicy":"IfNotPresent"
-      },
-      "debugImageVersion": "test-debug-version",
-      "destinationGetNetworks": "10.0.0.0/8,172.16.0.0/12,192.168.0.0/16",
-      "outboundConnectTimeout": "1000ms",
-      "inboundConnectTimeout": "100ms"
-    }
-  install: |
-    {
-      "cliVersion":"linkerd-version",
-      "flags":[]
-    }
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: dev-undefined
diff --git a/cli/cmd/testdata/install_helm_output_ha.golden b/cli/cmd/testdata/install_helm_output_ha.golden
index cc4016be4..904d0d239 100644
--- a/cli/cmd/testdata/install_helm_output_ha.golden
+++ b/cli/cmd/testdata/install_helm_output_ha.golden
@@ -824,74 +824,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/helm linkerd-version
 data:
-  global: |
-    {
-      "linkerdNamespace": "linkerd",
-      "cniEnabled": false,
-      "version": "linkerd-version",
-      "identityContext":{
-        "trustDomain": "test.trust.domain",
-        "trustAnchorsPem": "test-trust-anchor",
-        "issuanceLifetime": "24h0m0s",
-        "clockSkewAllowance": "20s",
-        "scheme": "linkerd.io/tls"
-      },
-      "autoInjectContext": null,
-      "omitWebhookSideEffects": false,
-      "clusterDomain": "cluster.local"
-    }
-  proxy: |
-    {
-      "proxyImage":{
-        "imageName":"ghcr.io/linkerd/proxy",
-        "pullPolicy":"IfNotPresent"
-      },
-      "proxyInitImage":{
-        "imageName":"ghcr.io/linkerd/proxy-init",
-        "pullPolicy":"IfNotPresent"
-      },
-      "controlPort":{
-        "port": 4190
-      },
-      "ignoreInboundPorts":[{"portRange":"222"}],
-      "ignoreOutboundPorts":[{"portRange":"111"}],
-      "inboundPort":{
-        "port": 4143
-      },
-      "adminPort":{
-        "port": 4191
-      },
-      "outboundPort":{
-        "port": 4140
-      },
-      "resource":{
-        "requestCpu": "100m",
-        "limitCpu": "1",
-        "requestMemory": "20Mi",
-        "limitMemory": "250Mi"
-      },
-      "proxyUid": 2102,
-      "logLevel":{
-        "level": "warn,linkerd=info"
-      },
-      "logFormat": "plain",
-      "disableExternalProfiles": true,
-      "proxyVersion": "test-proxy-version",
-      "proxyInitImageVersion": "test-proxy-init-version",
-      "debugImage":{
-        "imageName":"ghcr.io/linkerd/debug",
-        "pullPolicy":"IfNotPresent"
-      },
-      "debugImageVersion": "test-debug-version",
-      "destinationGetNetworks": "10.0.0.0/8,172.16.0.0/12,192.168.0.0/16",
-      "outboundConnectTimeout": "1000ms",
-      "inboundConnectTimeout": "100ms"
-    }
-  install: |
-    {
-      "cliVersion":"linkerd-version",
-      "flags":[]
-    }
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: dev-undefined
diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden
index 3d486cf05..2d0ccf223 100644
--- a/cli/cmd/testdata/install_helm_output_ha_labels.golden
+++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden
@@ -824,74 +824,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/helm linkerd-version
 data:
-  global: |
-    {
-      "linkerdNamespace": "linkerd",
-      "cniEnabled": false,
-      "version": "linkerd-version",
-      "identityContext":{
-        "trustDomain": "test.trust.domain",
-        "trustAnchorsPem": "test-trust-anchor",
-        "issuanceLifetime": "24h0m0s",
-        "clockSkewAllowance": "20s",
-        "scheme": "linkerd.io/tls"
-      },
-      "autoInjectContext": null,
-      "omitWebhookSideEffects": false,
-      "clusterDomain": "cluster.local"
-    }
-  proxy: |
-    {
-      "proxyImage":{
-        "imageName":"ghcr.io/linkerd/proxy",
-        "pullPolicy":"IfNotPresent"
-      },
-      "proxyInitImage":{
-        "imageName":"ghcr.io/linkerd/proxy-init",
-        "pullPolicy":"IfNotPresent"
-      },
-      "controlPort":{
-        "port": 4190
-      },
-      "ignoreInboundPorts":[{"portRange":"444"}],
-      "ignoreOutboundPorts":[{"portRange":"333"}],
-      "inboundPort":{
-        "port": 4143
-      },
-      "adminPort":{
-        "port": 4191
-      },
-      "outboundPort":{
-        "port": 4140
-      },
-      "resource":{
-        "requestCpu": "100m",
-        "limitCpu": "1",
-        "requestMemory": "20Mi",
-        "limitMemory": "250Mi"
-      },
-      "proxyUid": 2102,
-      "logLevel":{
-        "level": "warn,linkerd=info"
-      },
-      "logFormat": "plain",
-      "disableExternalProfiles": true,
-      "proxyVersion": "test-proxy-version",
-      "proxyInitImageVersion": "test-proxy-init-version",
-      "debugImage":{
-        "imageName":"ghcr.io/linkerd/debug",
-        "pullPolicy":"IfNotPresent"
-      },
-      "debugImageVersion": "test-debug-version",
-      "destinationGetNetworks": "10.0.0.0/8,172.16.0.0/12,192.168.0.0/16",
-      "outboundConnectTimeout": "1000ms",
-      "inboundConnectTimeout": "100ms"
-    }
-  install: |
-    {
-      "cliVersion":"linkerd-version",
-      "flags":[]
-    }
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: dev-undefined
diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden
index d1bfb432a..f9676f490 100644
--- a/cli/cmd/testdata/install_no_init_container.golden
+++ b/cli/cmd/testdata/install_no_init_container.golden
@@ -795,9 +795,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden
index 31c9d1b08..1980b75c0 100644
--- a/cli/cmd/testdata/install_output.golden
+++ b/cli/cmd/testdata/install_output.golden
@@ -798,12 +798,6 @@ metadata:
   annotations:
     CreatedByAnnotation: CliVersion
 data:
-  global: |
-    GlobalConfig
-  proxy: |
-    ProxyConfig
-  install: |
-    InstallConfig
   values: |
     controllerImage: ControllerImage
     controllerImageVersion: ControllerImageVersion
diff --git a/cli/cmd/testdata/install_prometheus_overwrite.golden b/cli/cmd/testdata/install_prometheus_overwrite.golden
index e661e9e20..747eca48b 100644
--- a/cli/cmd/testdata/install_prometheus_overwrite.golden
+++ b/cli/cmd/testdata/install_prometheus_overwrite.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden
index 4da6b1897..a2cea4a8e 100644
--- a/cli/cmd/testdata/install_proxy_ignores.golden
+++ b/cli/cmd/testdata/install_proxy_ignores.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_restricted_dashboard.golden b/cli/cmd/testdata/install_restricted_dashboard.golden
index 7b5655b9f..57af26cfb 100644
--- a/cli/cmd/testdata/install_restricted_dashboard.golden
+++ b/cli/cmd/testdata/install_restricted_dashboard.golden
@@ -730,9 +730,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_tracing.golden b/cli/cmd/testdata/install_tracing.golden
index fba0ef8fe..6caf51d36 100644
--- a/cli/cmd/testdata/install_tracing.golden
+++ b/cli/cmd/testdata/install_tracing.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version
diff --git a/cli/cmd/testdata/install_tracing_overwrite.golden b/cli/cmd/testdata/install_tracing_overwrite.golden
index 479fa49aa..e5ef7d548 100644
--- a/cli/cmd/testdata/install_tracing_overwrite.golden
+++ b/cli/cmd/testdata/install_tracing_overwrite.golden
@@ -798,9 +798,6 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
 data:
-  global: |
-  proxy: |
-  install: |
   values: |
     controllerImage: ghcr.io/linkerd/controller
     controllerImageVersion: install-control-plane-version