daemon: remove deprecated and hidden --sidecar-http-proxy option

The --sidecar-http-proxy has been hidden and deprecated since Cilium
1.2.  Using it has no effect apart from a warning being logged. It's
also hidden and doesn't appear in documentation anymore, so remove it.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

daemon/daemon_main.go

@@ -566,10 +566,6 @@ func init() {
 	flags.Bool(option.Restore, true, "Restores state, if possible, from previous daemon")
 	option.BindEnv(option.Restore)
 
-	flags.Bool(option.SidecarHTTPProxy, false, "Disable host HTTP proxy, assuming proxies in sidecar containers")
-	flags.MarkHidden(option.SidecarHTTPProxy)
-	option.BindEnv(option.SidecarHTTPProxy)
-
 	flags.String(option.SidecarIstioProxyImage, k8s.DefaultSidecarIstioProxyImageRegexp,
 		"Regular expression matching compatible Istio sidecar istio-proxy container image names")
 	option.BindEnv(option.SidecarIstioProxyImage)
@@ -1041,10 +1037,6 @@ func initEnv(cmd *cobra.Command) {
 		}
 	}
 
-	if option.Config.SidecarHTTPProxy {
-		log.Warn(`"sidecar-http-proxy" flag is deprecated and has no effect`)
-	}
-
 	k8s.SidecarIstioProxyImageRegexp, err = regexp.Compile(option.Config.SidecarIstioProxyImage)
 	if err != nil {
 		log.WithError(err).Fatal("Invalid sidecar-istio-proxy-image regular expression")

pkg/option/config.go

@@ -330,9 +330,6 @@ const (
 	// Restore restores state, if possible, from previous daemon
 	Restore = "restore"
 
-	// SidecarHTTPProxy disable host HTTP proxy, assuming proxies in sidecar containers
-	SidecarHTTPProxy = "sidecar-http-proxy"
-
 	// SidecarIstioProxyImage regular expression matching compatible Istio sidecar istio-proxy container image names
 	SidecarIstioProxyImage = "sidecar-istio-proxy-image"
 
@@ -1188,7 +1185,6 @@ type DaemonConfig struct {
 	PreAllocateMaps             bool
 	IPv6NodeAddr                string
 	IPv4NodeAddr                string
-	SidecarHTTPProxy            bool
 	SidecarIstioProxyImage      string
 	SocketPath                  string
 	TracePayloadlen             int
@@ -2149,7 +2145,6 @@ func (c *DaemonConfig) Populate() {
 	c.DisableEnvoyVersionCheck = viper.GetBool(DisableEnvoyVersionCheck)
 	c.K8sNamespace = viper.GetString(K8sNamespaceName)
 	c.MaxControllerInterval = viper.GetInt(MaxCtrlIntervalName)
-	c.SidecarHTTPProxy = viper.GetBool(SidecarHTTPProxy)
 	c.PolicyQueueSize = sanitizeIntParam(PolicyQueueSize, defaults.PolicyQueueSize)
 	c.EndpointQueueSize = sanitizeIntParam(EndpointQueueSize, defaults.EndpointQueueSize)
 	c.SelectiveRegeneration = viper.GetBool(SelectiveRegeneration)