linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove install, global, and proxy fields from config entirely (#5067) 

Remove the now unused `global`, `install`, and `proxy` fields from the `linkerd-config` configmap.

Signed-off-by: Alex Leong <alex@buoyant.io>
This commit is contained in:
Alex Leong 2020-10-13 09:12:32 -07:00 committed by GitHub
parent f8e7295bdc
commit 0f4be79830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 0 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
charts/linkerd2/templates/_config.tpl
View File

@ -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 -}}

24
charts/linkerd2/templates/config.yaml
View File

@ -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 }}
{{- /*

1
cli/cmd/install.go
View File

@ -72,7 +72,6 @@ var (
}
templatesControlPlaneStage = []string{
"templates/_config.tpl",
"templates/_helpers.tpl",
"templates/config.yaml",
"templates/identity.yaml",

3
cli/cmd/testdata/install_addon.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_controlplane_tracing_output.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_custom_registry.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_default.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_default_override_dst_get_nets.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_grafana_existing.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_ha_output.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_ha_with_overrides_output.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_heartbeat_disabled_output.golden vendored
View File

@ -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

68
cli/cmd/testdata/install_helm_output.golden vendored
View File

@ -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

68
cli/cmd/testdata/install_helm_output_addons.golden vendored
View File

@ -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

68
cli/cmd/testdata/install_helm_output_ha.golden vendored
View File

@ -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

68
cli/cmd/testdata/install_helm_output_ha_labels.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_no_init_container.golden vendored
View File

@ -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

6
cli/cmd/testdata/install_output.golden vendored
View File

@ -798,12 +798,6 @@ metadata:
annotations:
CreatedByAnnotation: CliVersion
data:
global: |
GlobalConfig
proxy: |
ProxyConfig
install: |
InstallConfig
values: |
controllerImage: ControllerImage
controllerImageVersion: ControllerImageVersion

3
cli/cmd/testdata/install_prometheus_overwrite.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_proxy_ignores.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_restricted_dashboard.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_tracing.golden vendored
View File

@ -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

3
cli/cmd/testdata/install_tracing_overwrite.golden vendored
View File

@ -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