Remove proxy bind timeout from CLIs (#2017)

This branch removes the `--proxy-bind-timeout` flag from the `linkerd inject` and `linkerd install` CLI commands, and the `LINKERD2_PROXY_BIND_TIMEOUT` environment variable from their output. This is in preparation for removing that timeout from the proxy (as described in #2013). I thought it was prudent to remove this from the CLIs before removing it from the proxy, so we can't create a situation where the CLIs produce output that results in broken proxy containers. Fixes #2013 Signed-off-by: Eliza Weisman <[email protected]>
linkerd · Jan 24, 2019 · 846975a · 846975a
1 parent d542571
commit 846975a
Show file tree

Hide file tree

Showing 29 changed files with 20 additions and 129 deletions.
diff --git a/cli/cmd/inject.go b/cli/cmd/inject.go
@@ -251,7 +251,6 @@ func injectPodSpec(t *v1.PodSpec, identity k8s.TLSIdentity, controlPlaneDNSNameO
 		Resources: resources,
 		Env: []v1.EnvVar{
 			{Name: "LINKERD2_PROXY_LOG", Value: options.proxyLogLevel},
-			{Name: "LINKERD2_PROXY_BIND_TIMEOUT", Value: options.proxyBindTimeout},
 			{
 				Name:  "LINKERD2_PROXY_CONTROL_URL",
 				Value: fmt.Sprintf("tcp://%s:%d", controlPlaneDNS, options.proxyAPIPort),

diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -58,7 +58,6 @@ type installConfig struct {
 	ProxyImage                       string
 	ProxyResourceRequestCPU          string
 	ProxyResourceRequestMemory       string
-	ProxyBindTimeout                 string
 	SingleNamespace                  bool
 	EnableHA                         bool
 	ControllerUID                    int64
@@ -201,7 +200,6 @@ func validateAndBuildConfig(options *installOptions) (*installConfig, error) {
 		ProxyImage:                       options.taggedProxyImage(),
 		ProxyResourceRequestCPU:          options.proxyCPURequest,
 		ProxyResourceRequestMemory:       options.proxyMemoryRequest,
-		ProxyBindTimeout:                 "1m",
 		SingleNamespace:                  options.singleNamespace,
 		EnableHA:                         options.highAvailability,
 		ProfileSuffixes:                  profileSuffixes,

diff --git a/cli/cmd/install_test.go b/cli/cmd/install_test.go
@@ -65,7 +65,6 @@ func TestRender(t *testing.T) {
 		IgnoreOutboundPorts:              "2,3,4",
 		ProxyResourceRequestCPU:          "RequestCPU",
 		ProxyResourceRequestMemory:       "RequestMemory",
-		ProxyBindTimeout:                 "1m",
 		ProfileSuffixes:                  "suffix.",
 		EnableH2Upgrade:                  true,
 	}

diff --git a/cli/cmd/root.go b/cli/cmd/root.go
@@ -233,7 +233,6 @@ type proxyConfigOptions struct {
 	ignoreOutboundPorts     []uint
 	proxyUID                int64
 	proxyLogLevel           string
-	proxyBindTimeout        string
 	proxyAPIPort            uint
 	proxyControlPort        uint
 	proxyMetricsPort        uint
@@ -251,25 +250,24 @@ const (
 
 func newProxyConfigOptions() *proxyConfigOptions {
 	return &proxyConfigOptions{
-		linkerdVersion:          version.Version,
-		proxyImage:              defaultDockerRegistry + "/proxy",
-		initImage:               defaultDockerRegistry + "/proxy-init",
-		dockerRegistry:          defaultDockerRegistry,
-		imagePullPolicy:         "IfNotPresent",
-		inboundPort:             4143,
-		outboundPort:            4140,
-		ignoreInboundPorts:      nil,
-		ignoreOutboundPorts:     nil,
-		proxyUID:                2102,
-		proxyLogLevel:           "warn,linkerd2_proxy=info",
-		proxyBindTimeout:        "10s",
-		proxyAPIPort:            8086,
-		proxyControlPort:        4190,
-		proxyMetricsPort:        4191,
-		proxyOutboundCapacity:   map[string]uint{},
-		proxyCPURequest:         "",
-		proxyMemoryRequest:      "",
-		tls:                     "",
+		linkerdVersion:        version.Version,
+		proxyImage:            defaultDockerRegistry + "/proxy",
+		initImage:             defaultDockerRegistry + "/proxy-init",
+		dockerRegistry:        defaultDockerRegistry,
+		imagePullPolicy:       "IfNotPresent",
+		inboundPort:           4143,
+		outboundPort:          4140,
+		ignoreInboundPorts:    nil,
+		ignoreOutboundPorts:   nil,
+		proxyUID:              2102,
+		proxyLogLevel:         "warn,linkerd2_proxy=info",
+		proxyAPIPort:          8086,
+		proxyControlPort:      4190,
+		proxyMetricsPort:      4191,
+		proxyOutboundCapacity: map[string]uint{},
+		proxyCPURequest:       "",
+		proxyMemoryRequest:    "",
+		tls:                   "",
 		disableExternalProfiles: false,
 	}
 }
@@ -287,10 +285,6 @@ func (options *proxyConfigOptions) validate() error {
 		return fmt.Errorf("--image-pull-policy must be one of: Always, IfNotPresent, Never")
 	}
 
-	if _, err := time.ParseDuration(options.proxyBindTimeout); err != nil {
-		return fmt.Errorf("Invalid duration '%s' for --proxy-bind-timeout flag", options.proxyBindTimeout)
-	}
-
 	if options.proxyCPURequest != "" {
 		if _, err := k8sResource.ParseQuantity(options.proxyCPURequest); err != nil {
 			return fmt.Errorf("Invalid cpu request '%s' for --proxy-cpu flag", options.proxyCPURequest)
@@ -332,7 +326,6 @@ func addProxyConfigFlags(cmd *cobra.Command, options *proxyConfigOptions) {
 	cmd.PersistentFlags().StringVar(&options.imagePullPolicy, "image-pull-policy", options.imagePullPolicy, "Docker image pull policy")
 	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.proxyBindTimeout, "proxy-bind-timeout", options.proxyBindTimeout, "Timeout the proxy will use")
 	cmd.PersistentFlags().UintVar(&options.inboundPort, "inbound-port", options.inboundPort, "Proxy port to use for inbound traffic")
 	cmd.PersistentFlags().UintVar(&options.outboundPort, "outbound-port", options.outboundPort, "Proxy port to use for outbound traffic")
 	cmd.PersistentFlags().UintVar(&options.proxyAPIPort, "api-port", options.proxyAPIPort, "Port where the Linkerd controller is running")

diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml
@@ -29,8 +29,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml
@@ -29,8 +29,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -124,8 +122,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml
@@ -29,8 +29,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml
@@ -40,8 +40,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -146,8 +144,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -252,8 +248,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -358,8 +352,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml
@@ -40,8 +40,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml
@@ -40,8 +40,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -146,8 +144,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml
@@ -41,8 +41,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_tls.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_tls.golden.yml
@@ -40,8 +40,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml
@@ -42,8 +42,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml
@@ -42,8 +42,6 @@ items:
         - env:
           - name: LINKERD2_PROXY_LOG
             value: warn,linkerd2_proxy=info
-          - name: LINKERD2_PROXY_BIND_TIMEOUT
-            value: 10s
           - name: LINKERD2_PROXY_CONTROL_URL
             value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
           - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -142,8 +140,6 @@ items:
         - env:
           - name: LINKERD2_PROXY_LOG
             value: warn,linkerd2_proxy=info
-          - name: LINKERD2_PROXY_BIND_TIMEOUT
-            value: 10s
           - name: LINKERD2_PROXY_CONTROL_URL
             value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
           - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml
@@ -23,8 +23,6 @@ spec:
   - env:
     - name: LINKERD2_PROXY_LOG
       value: warn,linkerd2_proxy=info
-    - name: LINKERD2_PROXY_BIND_TIMEOUT
-      value: 10s
     - name: LINKERD2_PROXY_CONTROL_URL
       value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
     - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_pod_tls.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_tls.golden.yml
@@ -23,8 +23,6 @@ spec:
   - env:
     - name: LINKERD2_PROXY_LOG
       value: warn,linkerd2_proxy=info
-    - name: LINKERD2_PROXY_BIND_TIMEOUT
-      value: 10s
     - name: LINKERD2_PROXY_CONTROL_URL
       value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
     - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml
@@ -23,8 +23,6 @@ spec:
   - env:
     - name: LINKERD2_PROXY_LOG
       value: warn,linkerd2_proxy=info
-    - name: LINKERD2_PROXY_BIND_TIMEOUT
-      value: 10s
     - name: LINKERD2_PROXY_CONTROL_URL
       value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
     - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml
@@ -40,8 +40,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml
@@ -42,8 +42,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -150,8 +148,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden
@@ -226,8 +226,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://localhost.:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -466,8 +464,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -609,8 +605,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -854,8 +848,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER

diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden
@@ -235,8 +235,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://localhost.:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -481,8 +479,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -630,8 +626,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER
@@ -881,8 +875,6 @@ spec:
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd2_proxy=info
-        - name: LINKERD2_PROXY_BIND_TIMEOUT
-          value: 10s
         - name: LINKERD2_PROXY_CONTROL_URL
           value: tcp://linkerd-proxy-api.linkerd.svc.cluster.local:8086
         - name: LINKERD2_PROXY_CONTROL_LISTENER