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

Remove `--api-port` flag from the cli (#2429) 

* Changed the protobuf definition to take out destinationApiPort entirely
* Store destinationAPIPort as a constant in pkg/inject.go

Fixes #2351

Signed-off-by: Aditya Sharma <hello@adi.run>
This commit is contained in:
Aditya Sharma 2019-03-06 18:54:12 -05:00 committed by Ivan Sim
parent 1bb60e2bc5
commit 3740aa238a
16 changed files with 90 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chart/templates/controller.yaml
View File

@ -86,8 +86,8 @@ spec:
{{.Values.ControllerComponentLabel}}: controller {{.Values.ControllerComponentLabel}}: controller
ports: ports:
- name: grpc - name: grpc
port: {{.Values.DestinationAPIPort}} port: 8086
targetPort: {{.Values.DestinationAPIPort}} targetPort: 8086
--- ---
kind: Deployment kind: Deployment
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
@ -143,14 +143,14 @@ spec:
- name: destination - name: destination
ports: ports:
- name: grpc - name: grpc
containerPort: {{.Values.DestinationAPIPort}} containerPort: 8086
- name: admin-http - name: admin-http
containerPort: 9996 containerPort: 9996
image: {{.Values.ControllerImage}} image: {{.Values.ControllerImage}}
imagePullPolicy: {{.Values.ImagePullPolicy}} imagePullPolicy: {{.Values.ImagePullPolicy}}
args: args:
- "destination" - "destination"
- "-addr=:{{.Values.DestinationAPIPort}}" - "-addr=:8086"
- "-controller-namespace={{.Values.Namespace}}" - "-controller-namespace={{.Values.Namespace}}"
- "-enable-tls={{.Values.EnableTLS}}" - "-enable-tls={{.Values.EnableTLS}}"
- "-enable-h2-upgrade={{.Values.EnableH2Upgrade}}" - "-enable-h2-upgrade={{.Values.EnableH2Upgrade}}"

1
cli/cmd/inject.go
View File

@ -278,7 +278,6 @@ func injectOptionsToConfigs(options *injectOptions) configs {
ImageName: registryOverride(options.initImage, options.dockerRegistry), ImageName: registryOverride(options.initImage, options.dockerRegistry),
PullPolicy: options.imagePullPolicy, PullPolicy: options.imagePullPolicy,
}, },
DestinationApiPort: &config.Port{Port: uint32(options.destinationAPIPort)},
ControlPort: &config.Port{Port: uint32(options.proxyControlPort)}, ControlPort: &config.Port{Port: uint32(options.proxyControlPort)},
IgnoreInboundPorts: ignoreInboundPorts, IgnoreInboundPorts: ignoreInboundPorts,
IgnoreOutboundPorts: ignoreOutboundPorts, IgnoreOutboundPorts: ignoreOutboundPorts,

5
cli/cmd/install.go
View File

@ -37,7 +37,6 @@ type installConfig struct {
ControllerLogLevel string ControllerLogLevel string
ControllerComponentLabel string ControllerComponentLabel string
CreatedByAnnotation string CreatedByAnnotation string
DestinationAPIPort uint
EnableTLS bool EnableTLS bool
TLSTrustAnchorConfigMapName string TLSTrustAnchorConfigMapName string
ProxyContainerName string ProxyContainerName string
@ -170,7 +169,6 @@ func validateAndBuildConfig(options *installOptions) (*installConfig, error) {
ControllerComponentLabel: k8s.ControllerComponentLabel, ControllerComponentLabel: k8s.ControllerComponentLabel,
ControllerUID: options.controllerUID, ControllerUID: options.controllerUID,
CreatedByAnnotation: k8s.CreatedByAnnotation, CreatedByAnnotation: k8s.CreatedByAnnotation,
DestinationAPIPort: options.destinationAPIPort,
EnableTLS: options.enableTLS(), EnableTLS: options.enableTLS(),
TLSTrustAnchorConfigMapName: k8s.TLSTrustAnchorConfigMapName, TLSTrustAnchorConfigMapName: k8s.TLSTrustAnchorConfigMapName,
ProxyContainerName: k8s.ProxyContainerName, ProxyContainerName: k8s.ProxyContainerName,
@ -326,9 +324,6 @@ func proxyConfig(options *installOptions) *config.Proxy {
ImageName: registryOverride(options.initImage, options.dockerRegistry), ImageName: registryOverride(options.initImage, options.dockerRegistry),
PullPolicy: options.imagePullPolicy, PullPolicy: options.imagePullPolicy,
}, },
DestinationApiPort: &config.Port{
Port: uint32(options.destinationAPIPort),
},
ControlPort: &config.Port{ ControlPort: &config.Port{
Port: uint32(options.proxyControlPort), Port: uint32(options.proxyControlPort),
}, },

2
cli/cmd/install_test.go
View File

@ -36,7 +36,6 @@ func TestRender(t *testing.T) {
ControllerLogLevel: "ControllerLogLevel", ControllerLogLevel: "ControllerLogLevel",
ControllerComponentLabel: "ControllerComponentLabel", ControllerComponentLabel: "ControllerComponentLabel",
CreatedByAnnotation: "CreatedByAnnotation", CreatedByAnnotation: "CreatedByAnnotation",
DestinationAPIPort: 123,
EnableTLS: true, EnableTLS: true,
TLSTrustAnchorConfigMapName: "TLSTrustAnchorConfigMapName", TLSTrustAnchorConfigMapName: "TLSTrustAnchorConfigMapName",
ProxyContainerName: "ProxyContainerName", ProxyContainerName: "ProxyContainerName",
@ -66,7 +65,6 @@ func TestRender(t *testing.T) {
ControllerLogLevel: "ControllerLogLevel", ControllerLogLevel: "ControllerLogLevel",
ControllerComponentLabel: "ControllerComponentLabel", ControllerComponentLabel: "ControllerComponentLabel",
CreatedByAnnotation: "CreatedByAnnotation", CreatedByAnnotation: "CreatedByAnnotation",
DestinationAPIPort: 123,
ControllerUID: 2103, ControllerUID: 2103,
EnableTLS: true, EnableTLS: true,
TLSTrustAnchorConfigMapName: "TLSTrustAnchorConfigMapName", TLSTrustAnchorConfigMapName: "TLSTrustAnchorConfigMapName",

4
cli/cmd/root.go
View File

@ -256,7 +256,6 @@ type proxyConfigOptions struct {
ignoreOutboundPorts []uint ignoreOutboundPorts []uint
proxyUID int64 proxyUID int64
proxyLogLevel string proxyLogLevel string
destinationAPIPort uint
proxyControlPort uint proxyControlPort uint
proxyMetricsPort uint proxyMetricsPort uint
proxyCPURequest string proxyCPURequest string
@ -287,7 +286,6 @@ func newProxyConfigOptions() *proxyConfigOptions {
ignoreOutboundPorts: nil, ignoreOutboundPorts: nil,
proxyUID: 2102, proxyUID: 2102,
proxyLogLevel: "warn,linkerd2_proxy=info", proxyLogLevel: "warn,linkerd2_proxy=info",
destinationAPIPort: 8086,
proxyControlPort: 4190, proxyControlPort: 4190,
proxyMetricsPort: 4191, proxyMetricsPort: 4191,
proxyCPURequest: "", proxyCPURequest: "",
@ -310,7 +308,6 @@ func newConfig() configs {
proxyConfig := &config.Proxy{ proxyConfig := &config.Proxy{
ProxyImage: &config.Image{ImageName: defaultDockerRegistry + "/proxy", PullPolicy: "IfNotPresent"}, ProxyImage: &config.Image{ImageName: defaultDockerRegistry + "/proxy", PullPolicy: "IfNotPresent"},
ProxyInitImage: &config.Image{ImageName: defaultDockerRegistry + "/proxy-init", PullPolicy: "IfNotPresent"}, ProxyInitImage: &config.Image{ImageName: defaultDockerRegistry + "/proxy-init", PullPolicy: "IfNotPresent"},
DestinationApiPort: &config.Port{Port: 8086},
ControlPort: &config.Port{Port: 4190}, ControlPort: &config.Port{Port: 4190},
IgnoreInboundPorts: nil, IgnoreInboundPorts: nil,
IgnoreOutboundPorts: nil, IgnoreOutboundPorts: nil,
@ -413,7 +410,6 @@ func addProxyConfigFlags(cmd *cobra.Command, options *proxyConfigOptions) {
cmd.PersistentFlags().UintSliceVar(&options.ignoreOutboundPorts, "skip-outbound-ports", options.ignoreOutboundPorts, "Outbound ports that should skip the proxy") cmd.PersistentFlags().UintSliceVar(&options.ignoreOutboundPorts, "skip-outbound-ports", options.ignoreOutboundPorts, "Outbound ports that should skip the proxy")
cmd.PersistentFlags().Int64Var(&options.proxyUID, "proxy-uid", options.proxyUID, "Run the proxy under this user ID") cmd.PersistentFlags().Int64Var(&options.proxyUID, "proxy-uid", options.proxyUID, "Run the proxy under this user ID")
cmd.PersistentFlags().StringVar(&options.proxyLogLevel, "proxy-log-level", options.proxyLogLevel, "Log level for the proxy") cmd.PersistentFlags().StringVar(&options.proxyLogLevel, "proxy-log-level", options.proxyLogLevel, "Log level for the proxy")
cmd.PersistentFlags().UintVar(&options.destinationAPIPort, "api-port", options.destinationAPIPort, "Port where the Linkerd controller's destination API is running")
cmd.PersistentFlags().UintVar(&options.proxyControlPort, "control-port", options.proxyControlPort, "Proxy port to use for control") cmd.PersistentFlags().UintVar(&options.proxyControlPort, "control-port", options.proxyControlPort, "Proxy port to use for control")
cmd.PersistentFlags().UintVar(&options.proxyMetricsPort, "metrics-port", options.proxyMetricsPort, "Proxy port to serve metrics on") cmd.PersistentFlags().UintVar(&options.proxyMetricsPort, "metrics-port", options.proxyMetricsPort, "Proxy port to serve metrics on")
cmd.PersistentFlags().StringVar(&options.proxyCPURequest, "proxy-cpu-request", options.proxyCPURequest, "Amount of CPU units that the proxy sidecar requests") cmd.PersistentFlags().StringVar(&options.proxyCPURequest, "proxy-cpu-request", options.proxyCPURequest, "Amount of CPU units that the proxy sidecar requests")

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

@ -273,7 +273,7 @@ data:
global: | global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"dev-undefined","identityContext":null} {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"dev-undefined","identityContext":null}
proxy: | proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"destinationApiPort":{"port":8086},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false} {"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false}
--- ---
### ###

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

@ -285,7 +285,7 @@ data:
global: | global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"dev-undefined","identityContext":null} {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"dev-undefined","identityContext":null}
proxy: | proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"destinationApiPort":{"port":8086},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"10m","requestMemory":"20Mi","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false} {"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"10m","requestMemory":"20Mi","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false}
--- ---
### ###

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

@ -285,7 +285,7 @@ data:
global: | global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"dev-undefined","identityContext":null} {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"dev-undefined","identityContext":null}
proxy: | proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"destinationApiPort":{"port":8086},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"400m","requestMemory":"300Mi","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false} {"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"400m","requestMemory":"300Mi","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false}
--- ---
### ###

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

@ -249,7 +249,7 @@ data:
global: | global: |
{"linkerdNamespace":"linkerd","cniEnabled":true,"version":"dev-undefined","identityContext":null} {"linkerdNamespace":"linkerd","cniEnabled":true,"version":"dev-undefined","identityContext":null}
proxy: | proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"destinationApiPort":{"port":8086},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false} {"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false}
--- ---
### ###

2
cli/cmd/testdata/install_no_init_container_auto_inject.golden vendored
View File

@ -279,7 +279,7 @@ data:
global: | global: |
{"linkerdNamespace":"linkerd","cniEnabled":true,"version":"dev-undefined","identityContext":{}} {"linkerdNamespace":"linkerd","cniEnabled":true,"version":"dev-undefined","identityContext":{}}
proxy: | proxy: |
{"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"destinationApiPort":{"port":8086},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false} {"proxyImage":{"imageName":"gcr.io/linkerd-io/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"gcr.io/linkerd-io/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"metricsPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd2_proxy=info"},"disableExternalProfiles":false}
--- ---
### ###

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

@ -80,8 +80,8 @@ spec:
ControllerComponentLabel: controller ControllerComponentLabel: controller
ports: ports:
- name: grpc - name: grpc
port: 123 port: 8086
targetPort: 123 targetPort: 8086
--- ---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
@ -138,7 +138,7 @@ spec:
runAsUser: 2103 runAsUser: 2103
- args: - args:
- destination - destination
- -addr=:123 - -addr=:8086
- -controller-namespace=Namespace - -controller-namespace=Namespace
- -enable-tls=true - -enable-tls=true
- -enable-h2-upgrade=true - -enable-h2-upgrade=true
@ -152,7 +152,7 @@ spec:
initialDelaySeconds: 10 initialDelaySeconds: 10
name: destination name: destination
ports: ports:
- containerPort: 123 - containerPort: 8086
name: grpc name: grpc
- containerPort: 9996 - containerPort: 9996
name: admin-http name: admin-http

8
cli/cmd/testdata/install_single_namespace_output.golden vendored
View File

@ -76,8 +76,8 @@ spec:
ControllerComponentLabel: controller ControllerComponentLabel: controller
ports: ports:
- name: grpc - name: grpc
port: 123 port: 8086
targetPort: 123 targetPort: 8086
--- ---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
@ -134,7 +134,7 @@ spec:
runAsUser: 2103 runAsUser: 2103
- args: - args:
- destination - destination
- -addr=:123 - -addr=:8086
- -controller-namespace=Namespace - -controller-namespace=Namespace
- -enable-tls=true - -enable-tls=true
- -enable-h2-upgrade=true - -enable-h2-upgrade=true
@ -148,7 +148,7 @@ spec:
initialDelaySeconds: 10 initialDelaySeconds: 10
name: destination name: destination
ports: ports:
- containerPort: 123 - containerPort: 8086
name: grpc name: grpc
- containerPort: 9996 - containerPort: 9996
name: admin-http name: admin-http

129
controller/gen/config/config.pb.go generated
View File

@ -35,7 +35,7 @@ func (m *Global) Reset() { *m = Global{} }
func (m *Global) String() string { return proto.CompactTextString(m) } func (m *Global) String() string { return proto.CompactTextString(m) }
func (*Global) ProtoMessage() {} func (*Global) ProtoMessage() {}
func (*Global) Descriptor() ([]byte, []int) { func (*Global) Descriptor() ([]byte, []int) {
return fileDescriptor_config_258e78b4e2a10c28, []int{0} return fileDescriptor_config_433876e2a8cfc063, []int{0}
} }
func (m *Global) XXX_Unmarshal(b []byte) error { func (m *Global) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Global.Unmarshal(m, b) return xxx_messageInfo_Global.Unmarshal(m, b)
@ -86,17 +86,16 @@ func (m *Global) GetIdentityContext() *IdentityContext {
type Proxy struct { type Proxy struct {
ProxyImage *Image `protobuf:"bytes,1,opt,name=proxy_image,json=proxyImage,proto3" json:"proxy_image,omitempty"` ProxyImage *Image `protobuf:"bytes,1,opt,name=proxy_image,json=proxyImage,proto3" json:"proxy_image,omitempty"`
ProxyInitImage *Image `protobuf:"bytes,2,opt,name=proxy_init_image,json=proxyInitImage,proto3" json:"proxy_init_image,omitempty"` ProxyInitImage *Image `protobuf:"bytes,2,opt,name=proxy_init_image,json=proxyInitImage,proto3" json:"proxy_init_image,omitempty"`
DestinationApiPort *Port `protobuf:"bytes,3,opt,name=destination_api_port,json=destinationApiPort,proto3" json:"destination_api_port,omitempty"` ControlPort *Port `protobuf:"bytes,3,opt,name=control_port,json=controlPort,proto3" json:"control_port,omitempty"`
ControlPort *Port `protobuf:"bytes,4,opt,name=control_port,json=controlPort,proto3" json:"control_port,omitempty"` IgnoreInboundPorts []*Port `protobuf:"bytes,4,rep,name=ignore_inbound_ports,json=ignoreInboundPorts,proto3" json:"ignore_inbound_ports,omitempty"`
IgnoreInboundPorts []*Port `protobuf:"bytes,5,rep,name=ignore_inbound_ports,json=ignoreInboundPorts,proto3" json:"ignore_inbound_ports,omitempty"` IgnoreOutboundPorts []*Port `protobuf:"bytes,5,rep,name=ignore_outbound_ports,json=ignoreOutboundPorts,proto3" json:"ignore_outbound_ports,omitempty"`
IgnoreOutboundPorts []*Port `protobuf:"bytes,6,rep,name=ignore_outbound_ports,json=ignoreOutboundPorts,proto3" json:"ignore_outbound_ports,omitempty"` InboundPort *Port `protobuf:"bytes,6,opt,name=inbound_port,json=inboundPort,proto3" json:"inbound_port,omitempty"`
InboundPort *Port `protobuf:"bytes,7,opt,name=inbound_port,json=inboundPort,proto3" json:"inbound_port,omitempty"` MetricsPort *Port `protobuf:"bytes,7,opt,name=metrics_port,json=metricsPort,proto3" json:"metrics_port,omitempty"`
MetricsPort *Port `protobuf:"bytes,8,opt,name=metrics_port,json=metricsPort,proto3" json:"metrics_port,omitempty"` OutboundPort *Port `protobuf:"bytes,8,opt,name=outbound_port,json=outboundPort,proto3" json:"outbound_port,omitempty"`
OutboundPort *Port `protobuf:"bytes,9,opt,name=outbound_port,json=outboundPort,proto3" json:"outbound_port,omitempty"` Resource *ResourceRequirements `protobuf:"bytes,9,opt,name=resource,proto3" json:"resource,omitempty"`
Resource *ResourceRequirements `protobuf:"bytes,10,opt,name=resource,proto3" json:"resource,omitempty"` ProxyUid int64 `protobuf:"varint,10,opt,name=proxy_uid,json=proxyUid,proto3" json:"proxy_uid,omitempty"`
ProxyUid int64 `protobuf:"varint,11,opt,name=proxy_uid,json=proxyUid,proto3" json:"proxy_uid,omitempty"` LogLevel *LogLevel `protobuf:"bytes,11,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"`
LogLevel *LogLevel `protobuf:"bytes,12,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"` DisableExternalProfiles bool `protobuf:"varint,12,opt,name=disable_external_profiles,json=disableExternalProfiles,proto3" json:"disable_external_profiles,omitempty"`
DisableExternalProfiles bool `protobuf:"varint,13,opt,name=disable_external_profiles,json=disableExternalProfiles,proto3" json:"disable_external_profiles,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
@ -106,7 +105,7 @@ func (m *Proxy) Reset() { *m = Proxy{} }
func (m *Proxy) String() string { return proto.CompactTextString(m) } func (m *Proxy) String() string { return proto.CompactTextString(m) }
func (*Proxy) ProtoMessage() {} func (*Proxy) ProtoMessage() {}
func (*Proxy) Descriptor() ([]byte, []int) { func (*Proxy) Descriptor() ([]byte, []int) {
return fileDescriptor_config_258e78b4e2a10c28, []int{1} return fileDescriptor_config_433876e2a8cfc063, []int{1}
} }
func (m *Proxy) XXX_Unmarshal(b []byte) error { func (m *Proxy) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Proxy.Unmarshal(m, b) return xxx_messageInfo_Proxy.Unmarshal(m, b)
@ -140,13 +139,6 @@ func (m *Proxy) GetProxyInitImage() *Image {
return nil return nil
} }
func (m *Proxy) GetDestinationApiPort() *Port {
if m != nil {
return m.DestinationApiPort
}
return nil
}
func (m *Proxy) GetControlPort() *Port { func (m *Proxy) GetControlPort() *Port {
if m != nil { if m != nil {
return m.ControlPort return m.ControlPort
@ -229,7 +221,7 @@ func (m *Image) Reset() { *m = Image{} }
func (m *Image) String() string { return proto.CompactTextString(m) } func (m *Image) String() string { return proto.CompactTextString(m) }
func (*Image) ProtoMessage() {} func (*Image) ProtoMessage() {}
func (*Image) Descriptor() ([]byte, []int) { func (*Image) Descriptor() ([]byte, []int) {
return fileDescriptor_config_258e78b4e2a10c28, []int{2} return fileDescriptor_config_433876e2a8cfc063, []int{2}
} }
func (m *Image) XXX_Unmarshal(b []byte) error { func (m *Image) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Image.Unmarshal(m, b) return xxx_messageInfo_Image.Unmarshal(m, b)
@ -274,7 +266,7 @@ func (m *Port) Reset() { *m = Port{} }
func (m *Port) String() string { return proto.CompactTextString(m) } func (m *Port) String() string { return proto.CompactTextString(m) }
func (*Port) ProtoMessage() {} func (*Port) ProtoMessage() {}
func (*Port) Descriptor() ([]byte, []int) { func (*Port) Descriptor() ([]byte, []int) {
return fileDescriptor_config_258e78b4e2a10c28, []int{3} return fileDescriptor_config_433876e2a8cfc063, []int{3}
} }
func (m *Port) XXX_Unmarshal(b []byte) error { func (m *Port) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Port.Unmarshal(m, b) return xxx_messageInfo_Port.Unmarshal(m, b)
@ -315,7 +307,7 @@ func (m *ResourceRequirements) Reset() { *m = ResourceRequirements{} }
func (m *ResourceRequirements) String() string { return proto.CompactTextString(m) } func (m *ResourceRequirements) String() string { return proto.CompactTextString(m) }
func (*ResourceRequirements) ProtoMessage() {} func (*ResourceRequirements) ProtoMessage() {}
func (*ResourceRequirements) Descriptor() ([]byte, []int) { func (*ResourceRequirements) Descriptor() ([]byte, []int) {
return fileDescriptor_config_258e78b4e2a10c28, []int{4} return fileDescriptor_config_433876e2a8cfc063, []int{4}
} }
func (m *ResourceRequirements) XXX_Unmarshal(b []byte) error { func (m *ResourceRequirements) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ResourceRequirements.Unmarshal(m, b) return xxx_messageInfo_ResourceRequirements.Unmarshal(m, b)
@ -373,7 +365,7 @@ func (m *IdentityContext) Reset() { *m = IdentityContext{} }
func (m *IdentityContext) String() string { return proto.CompactTextString(m) } func (m *IdentityContext) String() string { return proto.CompactTextString(m) }
func (*IdentityContext) ProtoMessage() {} func (*IdentityContext) ProtoMessage() {}
func (*IdentityContext) Descriptor() ([]byte, []int) { func (*IdentityContext) Descriptor() ([]byte, []int) {
return fileDescriptor_config_258e78b4e2a10c28, []int{5} return fileDescriptor_config_433876e2a8cfc063, []int{5}
} }
func (m *IdentityContext) XXX_Unmarshal(b []byte) error { func (m *IdentityContext) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_IdentityContext.Unmarshal(m, b) return xxx_messageInfo_IdentityContext.Unmarshal(m, b)
@ -404,7 +396,7 @@ func (m *LogLevel) Reset() { *m = LogLevel{} }
func (m *LogLevel) String() string { return proto.CompactTextString(m) } func (m *LogLevel) String() string { return proto.CompactTextString(m) }
func (*LogLevel) ProtoMessage() {} func (*LogLevel) ProtoMessage() {}
func (*LogLevel) Descriptor() ([]byte, []int) { func (*LogLevel) Descriptor() ([]byte, []int) {
return fileDescriptor_config_258e78b4e2a10c28, []int{6} return fileDescriptor_config_433876e2a8cfc063, []int{6}
} }
func (m *LogLevel) XXX_Unmarshal(b []byte) error { func (m *LogLevel) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_LogLevel.Unmarshal(m, b) return xxx_messageInfo_LogLevel.Unmarshal(m, b)
@ -441,49 +433,48 @@ func init() {
proto.RegisterType((*LogLevel)(nil), "linkerd2.config.LogLevel") proto.RegisterType((*LogLevel)(nil), "linkerd2.config.LogLevel")
} }
func init() { proto.RegisterFile("config/config.proto", fileDescriptor_config_258e78b4e2a10c28) } func init() { proto.RegisterFile("config/config.proto", fileDescriptor_config_433876e2a8cfc063) }
var fileDescriptor_config_258e78b4e2a10c28 = []byte{ var fileDescriptor_config_433876e2a8cfc063 = []byte{
// 654 bytes of a gzipped FileDescriptorProto // 632 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x6d, 0x6f, 0xd3, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xdd, 0x6e, 0xd3, 0x30,
0x10, 0xc7, 0xd5, 0xad, 0xed, 0xda, 0x4b, 0xbb, 0x07, 0xaf, 0x83, 0x0c, 0x84, 0x28, 0x91, 0x26, 0x14, 0x56, 0xb6, 0x76, 0x4b, 0x4f, 0xba, 0x3f, 0x6f, 0x83, 0x0c, 0x84, 0x08, 0x91, 0x26, 0x55,
0x55, 0x42, 0x6a, 0x45, 0x27, 0xc1, 0xb4, 0x57, 0x8c, 0x69, 0xaa, 0x26, 0x06, 0x54, 0x91, 0x78, 0x42, 0x6a, 0x45, 0x27, 0xc1, 0xb4, 0x2b, 0x60, 0x9a, 0xa6, 0x89, 0x01, 0x55, 0x24, 0x6e, 0xb8,
0xc3, 0x9b, 0x28, 0x4d, 0xbc, 0x70, 0xc2, 0xb1, 0x33, 0xc7, 0x99, 0xb6, 0x0f, 0x03, 0xdf, 0x84, 0x89, 0xda, 0xe4, 0x2c, 0x58, 0x38, 0x76, 0xe6, 0x38, 0xd3, 0xf6, 0x32, 0xbc, 0x09, 0x6f, 0xc1,
0xef, 0x86, 0xfc, 0x50, 0xe8, 0x56, 0x94, 0x57, 0x71, 0xfe, 0x77, 0xbf, 0xbf, 0x2f, 0x17, 0x9f, 0x03, 0x21, 0xff, 0x04, 0xba, 0x15, 0x7a, 0x15, 0xfb, 0x3b, 0xdf, 0xf7, 0xf9, 0xf8, 0xe4, 0x1c,
0x61, 0x3f, 0x11, 0xfc, 0x1a, 0xb3, 0x89, 0x7d, 0x8c, 0x0b, 0x29, 0x94, 0x20, 0x3b, 0x0c, 0xf9, 0xc3, 0x6e, 0x26, 0xf8, 0x15, 0x2d, 0x46, 0xf6, 0x33, 0xac, 0xa4, 0x50, 0x82, 0x6c, 0x31, 0xca,
0x0f, 0x2a, 0xd3, 0xe9, 0xd8, 0xca, 0xc1, 0xef, 0x06, 0xb4, 0x67, 0x4c, 0x2c, 0x62, 0x46, 0x5e, 0xbf, 0xa3, 0xcc, 0xc7, 0x43, 0x0b, 0xc7, 0x3f, 0x3d, 0x58, 0x3b, 0x67, 0x62, 0x36, 0x65, 0xe4,
0xc3, 0x9e, 0x8b, 0x46, 0x3c, 0xce, 0x69, 0x59, 0xc4, 0x09, 0xf5, 0x1b, 0xc3, 0xc6, 0xa8, 0x1b, 0x25, 0xec, 0xb8, 0x68, 0xca, 0xa7, 0x25, 0xd6, 0xd5, 0x34, 0xc3, 0xd0, 0x8b, 0xbc, 0x41, 0x2f,
0xee, 0xba, 0xc0, 0xe7, 0xa5, 0x4e, 0x5e, 0x82, 0x97, 0x70, 0x8c, 0x28, 0x8f, 0x17, 0x8c, 0xa6, 0xd9, 0x76, 0x81, 0x4f, 0x2d, 0x4e, 0x9e, 0x43, 0x90, 0x71, 0x9a, 0x22, 0x9f, 0xce, 0x18, 0xe6,
0xfe, 0xc6, 0xb0, 0x31, 0xea, 0x84, 0x90, 0x70, 0xbc, 0xb0, 0x0a, 0xf1, 0x61, 0xeb, 0x96, 0xca, 0xe1, 0x4a, 0xe4, 0x0d, 0xfc, 0x04, 0x32, 0x4e, 0xcf, 0x2c, 0x42, 0x42, 0x58, 0xbf, 0x41, 0x59,
0x12, 0x05, 0xf7, 0x37, 0x8d, 0xc7, 0xf2, 0x95, 0x7c, 0x84, 0x5d, 0x4c, 0x29, 0x57, 0xa8, 0xee, 0x53, 0xc1, 0xc3, 0x55, 0xe3, 0xd1, 0x6e, 0xc9, 0x07, 0xd8, 0xa6, 0x39, 0x72, 0x45, 0xd5, 0x5d,
0xa3, 0x44, 0x70, 0x45, 0xef, 0x94, 0xdf, 0x1c, 0x36, 0x46, 0xde, 0x74, 0x38, 0x7e, 0x54, 0xde, 0x9a, 0x09, 0xae, 0xf0, 0x56, 0x85, 0x9d, 0xc8, 0x1b, 0x04, 0xe3, 0x68, 0xf8, 0x20, 0xbd, 0xe1,
0xf8, 0xd2, 0x25, 0x9e, 0xdb, 0xbc, 0x70, 0x07, 0x1f, 0x0a, 0xc1, 0xcf, 0x36, 0xb4, 0xe6, 0x52, 0x85, 0x23, 0x9e, 0x5a, 0x5e, 0xb2, 0x45, 0xef, 0x03, 0xf1, 0xaf, 0x2e, 0x74, 0x27, 0x52, 0xdc,
0xdc, 0xdd, 0x93, 0x77, 0xe0, 0x15, 0x7a, 0x11, 0x61, 0x1e, 0x67, 0xb6, 0x70, 0x6f, 0xfa, 0x64, 0xde, 0x91, 0x37, 0x10, 0x54, 0x7a, 0x91, 0xd2, 0x72, 0x5a, 0xd8, 0xc4, 0x83, 0xf1, 0xa3, 0x45,
0xdd, 0x51, 0x47, 0x43, 0x30, 0xa9, 0x66, 0x4d, 0xde, 0xc3, 0xae, 0x03, 0x39, 0x2a, 0x47, 0x6f, 0x47, 0x1d, 0x4d, 0xc0, 0x50, 0xcd, 0x9a, 0xbc, 0x85, 0x6d, 0x27, 0xe4, 0x54, 0x39, 0xf5, 0xca,
0xd4, 0xd2, 0xdb, 0x96, 0xe6, 0xa8, 0xac, 0xc3, 0x0c, 0x06, 0x29, 0x2d, 0x15, 0xf2, 0x58, 0xa1, 0x52, 0xf5, 0xa6, 0x55, 0x73, 0xaa, 0xac, 0xc3, 0x31, 0xf4, 0xf5, 0x45, 0xa4, 0x60, 0x69, 0x25,
0xe0, 0x51, 0x5c, 0x60, 0x54, 0x08, 0xa9, 0xcc, 0x87, 0x7b, 0xd3, 0x83, 0x35, 0x97, 0xb9, 0x90, 0xa4, 0x32, 0x17, 0x0e, 0xc6, 0xfb, 0x0b, 0xea, 0x89, 0x90, 0x2a, 0x09, 0x1c, 0x55, 0x6f, 0xc8,
0x2a, 0x24, 0x2b, 0xc8, 0x59, 0x81, 0x5a, 0x23, 0x27, 0xd0, 0xd3, 0x1d, 0x91, 0x82, 0x59, 0x83, 0x39, 0xec, 0xd1, 0x82, 0x0b, 0x89, 0x29, 0xe5, 0x33, 0xd1, 0xf0, 0xdc, 0x18, 0xd4, 0x61, 0x27,
0x66, 0x9d, 0x81, 0xe7, 0x52, 0x0d, 0x39, 0x83, 0x01, 0x66, 0x5c, 0x48, 0x1a, 0x21, 0x5f, 0x88, 0x5a, 0xfd, 0xbf, 0x03, 0xb1, 0x92, 0x0b, 0xab, 0xd0, 0x50, 0x4d, 0x2e, 0x60, 0xdf, 0x19, 0x89,
0x8a, 0xa7, 0xc6, 0xa0, 0xf4, 0x5b, 0xc3, 0xcd, 0x9a, 0x12, 0x2c, 0x72, 0x69, 0x09, 0x2d, 0x95, 0x46, 0xcd, 0x3b, 0x75, 0x97, 0x39, 0xed, 0x5a, 0xcd, 0x67, 0x27, 0xb1, 0x56, 0xc7, 0xd0, 0x9f,
0xe4, 0x12, 0x0e, 0x9c, 0x91, 0xa8, 0xd4, 0xaa, 0x53, 0xbb, 0xce, 0x69, 0xdf, 0x32, 0x5f, 0x1c, 0x4f, 0x26, 0x5c, 0x5b, 0x7a, 0x1b, 0xfa, 0x37, 0x0b, 0xad, 0x2c, 0x51, 0x49, 0x9a, 0xd5, 0x56,
0x62, 0xad, 0x4e, 0xa0, 0xb7, 0x5a, 0x8c, 0xbf, 0x55, 0xfb, 0x35, 0xf8, 0xaf, 0x0a, 0x4d, 0xe6, 0xb9, 0xbe, 0x54, 0xe9, 0xa8, 0x46, 0x79, 0x02, 0x1b, 0xf7, 0xf2, 0x0e, 0xfd, 0x65, 0xd2, 0xbe,
0x54, 0x49, 0x4c, 0x4a, 0x4b, 0x76, 0x6a, 0x49, 0x97, 0x6a, 0xc8, 0x53, 0xe8, 0x3f, 0xa8, 0xdb, 0x98, 0x4b, 0x98, 0xbc, 0x03, 0x5f, 0x62, 0x2d, 0x1a, 0x99, 0x61, 0xd8, 0x33, 0xb2, 0xc3, 0x05,
0xef, 0xd6, 0xa1, 0x3d, 0xb1, 0x52, 0x30, 0x39, 0x83, 0x8e, 0xa4, 0xa5, 0xa8, 0x64, 0x42, 0x7d, 0x59, 0xe2, 0x08, 0x09, 0x5e, 0x37, 0x54, 0x62, 0x89, 0x5c, 0xd5, 0xc9, 0x1f, 0x19, 0x79, 0x0a,
0x30, 0xd8, 0xd1, 0x1a, 0x16, 0xba, 0x84, 0x90, 0xde, 0x54, 0x28, 0x69, 0x4e, 0xb9, 0x2a, 0xc3, 0x3d, 0xdb, 0x02, 0x0d, 0xcd, 0x43, 0x88, 0xbc, 0xc1, 0x6a, 0xe2, 0x1b, 0xe0, 0x0b, 0xcd, 0xc9,
0xbf, 0x18, 0x79, 0x0e, 0x5d, 0x7b, 0x96, 0x2a, 0x4c, 0x7d, 0x6f, 0xd8, 0x18, 0x6d, 0x86, 0x1d, 0x6b, 0xe8, 0x31, 0x51, 0xa4, 0x0c, 0x6f, 0x90, 0x85, 0x81, 0x39, 0xe0, 0x60, 0xe1, 0x80, 0x4b,
0x23, 0x7c, 0xc5, 0x94, 0xbc, 0x85, 0x2e, 0x13, 0x59, 0xc4, 0xe8, 0x2d, 0x65, 0x7e, 0xcf, 0x6c, 0x51, 0x5c, 0x6a, 0x42, 0xe2, 0x33, 0xb7, 0x22, 0x27, 0x70, 0x90, 0xd3, 0x5a, 0x4f, 0x43, 0x8a,
0x70, 0xb8, 0xb6, 0xc1, 0x95, 0xc8, 0xae, 0x74, 0x42, 0xd8, 0x61, 0x6e, 0x45, 0x4e, 0xe1, 0x30, 0xb7, 0x0a, 0x25, 0x9f, 0xb2, 0xb4, 0x92, 0xe2, 0x8a, 0x32, 0xac, 0xc3, 0xbe, 0x19, 0x98, 0xc7,
0xc5, 0x52, 0x8f, 0x55, 0x44, 0xef, 0x14, 0x95, 0x3c, 0x66, 0x51, 0x21, 0xc5, 0x35, 0x32, 0x5a, 0x8e, 0x70, 0xe6, 0xe2, 0x13, 0x17, 0x8e, 0xcf, 0xa1, 0x6b, 0x5b, 0xeb, 0x19, 0x80, 0xe9, 0x48,
0xfa, 0x7d, 0x33, 0x79, 0x4f, 0x5d, 0xc2, 0x85, 0x8b, 0xcf, 0x5d, 0x38, 0x98, 0x41, 0xcb, 0x9e, 0x33, 0x92, 0x6e, 0x1a, 0x7b, 0x06, 0xd1, 0xb3, 0xa8, 0xc7, 0xb0, 0x6a, 0x98, 0x6e, 0x3b, 0x46,
0xd1, 0x17, 0x00, 0xe6, 0x68, 0x9b, 0xd9, 0x76, 0x63, 0xdd, 0x35, 0x8a, 0x1e, 0x6a, 0x3d, 0xcf, 0xb3, 0x3b, 0xd3, 0xb6, 0xbd, 0x04, 0x34, 0x34, 0x31, 0x48, 0xfc, 0x04, 0x3a, 0xa6, 0x48, 0x04,
0x45, 0xc5, 0xf4, 0xb1, 0x63, 0x98, 0xdc, 0x9b, 0xf3, 0xdf, 0x0d, 0x41, 0x4b, 0x73, 0xa3, 0x04, 0x3a, 0xa6, 0xae, 0xda, 0x61, 0x23, 0x31, 0xeb, 0xf8, 0x87, 0x07, 0x7b, 0xff, 0x2a, 0x8c, 0x76,
0xcf, 0xa0, 0x69, 0x9a, 0x44, 0xa0, 0x69, 0xfa, 0xaa, 0x1d, 0xfa, 0xa1, 0x59, 0x07, 0xbf, 0x1a, 0x95, 0x78, 0xdd, 0x60, 0xad, 0xd2, 0xac, 0x6a, 0xdc, 0xa9, 0xe0, 0xa0, 0xd3, 0xaa, 0x21, 0x87,
0x30, 0xf8, 0x5f, 0x63, 0xb4, 0xab, 0xa4, 0x37, 0x15, 0x2d, 0x55, 0x94, 0x14, 0x95, 0xdb, 0x15, 0xb0, 0xd9, 0x12, 0x4a, 0x2c, 0x85, 0x6c, 0x4f, 0xde, 0x70, 0xe8, 0x47, 0x03, 0xea, 0xb2, 0x32,
0x9c, 0x74, 0x5e, 0x54, 0xe4, 0x08, 0xb6, 0x97, 0x09, 0x39, 0xcd, 0x85, 0x5c, 0xee, 0xdc, 0x77, 0x5a, 0x52, 0xeb, 0x62, 0x5f, 0x01, 0xdf, 0x00, 0xda, 0xe3, 0x05, 0xf4, 0x6d, 0xd0, 0x39, 0x74,
0xea, 0x27, 0x23, 0xea, 0xb6, 0x32, 0xcc, 0xd1, 0xba, 0xd8, 0xeb, 0xa4, 0x63, 0x04, 0xed, 0xf1, 0x4c, 0x3c, 0x30, 0x98, 0xd5, 0xc7, 0x3b, 0xb0, 0xf5, 0xe0, 0x01, 0x88, 0x23, 0xf0, 0xdb, 0x52,
0x0a, 0x7a, 0x36, 0xe8, 0x1c, 0x9a, 0x26, 0xee, 0x19, 0xcd, 0xf2, 0xc1, 0x1e, 0xec, 0x3c, 0xba, 0x93, 0x3d, 0xe8, 0xda, 0x9f, 0x62, 0x13, 0xb4, 0x9b, 0xf7, 0x47, 0x5f, 0x5f, 0x15, 0x54, 0x7d,
0x49, 0x82, 0x21, 0x74, 0x96, 0xad, 0x26, 0x03, 0x68, 0xd9, 0x9f, 0x62, 0x0b, 0xb4, 0x2f, 0x1f, 0x6b, 0x66, 0xc3, 0x4c, 0x94, 0x23, 0xf7, 0x9f, 0xda, 0xef, 0x78, 0xe4, 0xa6, 0x8f, 0xa1, 0x1c,
0x8e, 0xbf, 0xbd, 0xc9, 0x50, 0x7d, 0xaf, 0x16, 0xe3, 0x44, 0xe4, 0x13, 0xf7, 0x9f, 0x96, 0xcf, 0x15, 0xc8, 0xdd, 0xeb, 0x38, 0x5b, 0x33, 0xcf, 0xe3, 0xd1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff,
0xe9, 0xc4, 0x4d, 0x1f, 0xa3, 0x72, 0x92, 0x51, 0xee, 0xae, 0xd9, 0x45, 0xdb, 0xdc, 0xb3, 0xc7, 0xf4, 0x34, 0xf2, 0xba, 0x35, 0x05, 0x00, 0x00,
0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9f, 0xbe, 0x0a, 0x40, 0x7e, 0x05, 0x00, 0x00,
} }

1
controller/proxy-injector/webhook_test.go
View File

@ -24,7 +24,6 @@ var (
proxyConfig = &config.Proxy{ proxyConfig = &config.Proxy{
ProxyImage: &config.Image{ImageName: "gcr.io/linkerd-io/proxy", PullPolicy: "IfNotPresent"}, ProxyImage: &config.Image{ImageName: "gcr.io/linkerd-io/proxy", PullPolicy: "IfNotPresent"},
ProxyInitImage: &config.Image{ImageName: "gcr.io/linkerd-io/proxy-init", PullPolicy: "IfNotPresent"}, ProxyInitImage: &config.Image{ImageName: "gcr.io/linkerd-io/proxy-init", PullPolicy: "IfNotPresent"},
DestinationApiPort: &config.Port{Port: 8086},
ControlPort: &config.Port{Port: 4190}, ControlPort: &config.Port{Port: 4190},
IgnoreInboundPorts: nil, IgnoreInboundPorts: nil,
IgnoreOutboundPorts: nil, IgnoreOutboundPorts: nil,

4
pkg/inject/inject.go
View File

@ -31,6 +31,8 @@ const (
podNamespaceEnvVarName = "LINKERD2_PROXY_POD_NAMESPACE" podNamespaceEnvVarName = "LINKERD2_PROXY_POD_NAMESPACE"
// defaultKeepaliveMs is used in the proxy configuration for remote connections // defaultKeepaliveMs is used in the proxy configuration for remote connections
defaultKeepaliveMs = 10000 defaultKeepaliveMs = 10000
// destinationAPIPort is the port exposed by the linkerd-destination service
destinationAPIPort = 8086
) )
var injectableKinds = []string{ var injectableKinds = []string{
@ -420,7 +422,7 @@ func (conf *ResourceConfig) injectPodSpec(patch *Patch, identity k8s.TLSIdentity
{Name: "LINKERD2_PROXY_LOG", Value: conf.proxyConfig.GetLogLevel().GetLevel()}, {Name: "LINKERD2_PROXY_LOG", Value: conf.proxyConfig.GetLogLevel().GetLevel()},
{ {
Name: "LINKERD2_PROXY_CONTROL_URL", Name: "LINKERD2_PROXY_CONTROL_URL",
Value: fmt.Sprintf("tcp://%s:%d", controlPlaneDNS, conf.proxyConfig.GetDestinationApiPort().GetPort()), Value: fmt.Sprintf("tcp://%s:%d", controlPlaneDNS, destinationAPIPort),
}, },
{Name: "LINKERD2_PROXY_CONTROL_LISTENER", Value: fmt.Sprintf("tcp://0.0.0.0:%d", conf.proxyConfig.GetControlPort().GetPort())}, {Name: "LINKERD2_PROXY_CONTROL_LISTENER", Value: fmt.Sprintf("tcp://0.0.0.0:%d", conf.proxyConfig.GetControlPort().GetPort())},
{Name: "LINKERD2_PROXY_METRICS_LISTENER", Value: fmt.Sprintf("tcp://0.0.0.0:%d", conf.proxyConfig.GetMetricsPort().GetPort())}, {Name: "LINKERD2_PROXY_METRICS_LISTENER", Value: fmt.Sprintf("tcp://0.0.0.0:%d", conf.proxyConfig.GetMetricsPort().GetPort())},

21
proto/config/config.proto
View File

@ -19,19 +19,18 @@ message Proxy {
Image proxy_image = 1; Image proxy_image = 1;
Image proxy_init_image = 2; Image proxy_init_image = 2;
Port destination_api_port = 3; Port control_port = 3;
Port control_port = 4; repeated Port ignore_inbound_ports = 4;
repeated Port ignore_inbound_ports = 5; repeated Port ignore_outbound_ports = 5;
repeated Port ignore_outbound_ports = 6; Port inbound_port = 6;
Port inbound_port = 7; Port metrics_port = 7;
Port metrics_port = 8; Port outbound_port = 8;
Port outbound_port = 9;
ResourceRequirements resource = 10; ResourceRequirements resource = 9;
int64 proxy_uid = 11; int64 proxy_uid = 10;
LogLevel log_level = 12; LogLevel log_level = 11;
bool disable_external_profiles = 13; bool disable_external_profiles = 12;
} }
message Image { message Image {