Skip to content

Commit

Permalink
Deprecate --disable-k8s-services cilium-agent flag
Browse files Browse the repository at this point in the history
This patch deprecates the use of --disable-k8s-services option
in cilium-agent to disable the Kube-proxy, since it is redundant
to --kube-proxy-replacement option.
This option will be removed in v1.9.

Fixes: #10525
Signed-off-by: Swaminathan Vasudevan <svasudevan@suse.com>
  • Loading branch information
soumynathan authored and brb committed Mar 16, 2020
1 parent a5c0488 commit c5a33aa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Documentation/install/upgrade.rst
Expand Up @@ -302,6 +302,8 @@ Deprecated options
deprecated and will be removed in Cilium 1.9.
* ``access-log``: L7 access logs have been available via Hubble since Cilium
1.6. The ``access-log`` option to log to a file has been removed.
* ``--disable-k8s-services`` option from cilium-agent has been deprecated
and will be removed in Cilium 1.9.

Renamed Metrics
~~~~~~~~~~~~~~~
Expand Down
3 changes: 2 additions & 1 deletion daemon/daemon_main.go
Expand Up @@ -323,6 +323,7 @@ func init() {

flags.Bool(option.DisableK8sServices, false, "Disable east-west K8s load balancing by cilium")
option.BindEnv(option.DisableK8sServices)
flags.MarkDeprecated(option.DisableK8sServices, "This option is no longer supported and will be removed in v1.9")

flags.String(option.EgressMasqueradeInterfaces, "", "Limit egress masquerading to interface selector")
option.BindEnv(option.EgressMasqueradeInterfaces)
Expand Down Expand Up @@ -411,7 +412,7 @@ func init() {

flags.Int(option.IPv4ClusterCIDRMaskSize, 8, "Mask size for the cluster wide CIDR")
option.BindEnv(option.IPv4ClusterCIDRMaskSize)
flags.MarkDeprecated(option.IPv4ClusterCIDRMaskSize, "This option is no longer supported and will be removed in v1.9")
flags.MarkDeprecated(option.IPv4ClusterCIDRMaskSize, "This option has been deprecated and will be removed in v1.9")

flags.String(option.IPv4Range, AutoCIDR, "Per-node IPv4 endpoint prefix, e.g. 10.16.0.0/16")
option.BindEnv(option.IPv4Range)
Expand Down

0 comments on commit c5a33aa

Please sign in to comment.