Skip to content

Commit

Permalink
connect: remove ServiceConnectProxy config
Browse files Browse the repository at this point in the history
  • Loading branch information
mikemorris committed Aug 2, 2019
1 parent e17f8a6 commit 40702b3
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions agent/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,6 @@ type ServiceConnect struct {
// Native is true when this service can natively understand Connect.
Native *bool `json:"native,omitempty" hcl:"native" mapstructure:"native"`

// Proxy configures a connect proxy instance for the service
Proxy *ServiceConnectProxy `json:"proxy,omitempty" hcl:"proxy" mapstructure:"proxy"`

// SidecarService is a nested Service Definition to register at the same time.
// It's purely a convenience mechanism to allow specifying a sidecar service
// along with the application service definition. It's nested nature allows
Expand All @@ -434,11 +431,6 @@ type ServiceConnect struct {
SidecarService *ServiceDefinition `json:"sidecar_service,omitempty" hcl:"sidecar_service" mapstructure:"sidecar_service"`
}

type ServiceConnectProxy struct {
Config map[string]interface{} `json:"config,omitempty" hcl:"config" mapstructure:"config"`
Upstreams []Upstream `json:"upstreams,omitempty" hcl:"upstreams" mapstructure:"upstreams"`
}

// ServiceProxy is the additional config needed for a Kind = connect-proxy
// registration.
type ServiceProxy struct {
Expand Down

0 comments on commit 40702b3

Please sign in to comment.