Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

daemon: remove deprecated conntrack-garbage-collector-interval option #11134

Merged
merged 1 commit into from Apr 24, 2020
Merged

daemon: remove deprecated conntrack-garbage-collector-interval option #11134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/install/upgrade.rst
View file
Open in desktop
Expand Up @@ -525,6 +525,8 @@ Removed options
now removed.
* The options ``container-runtime`` and ``container-runtime-endpoint`` were
deprecated in Cilium 1.7 and are now removed.
* The ``conntrack-garbage-collector-interval`` option deprecated in Cilium 1.6
is now removed. Please use ``conntrack-gc-interval`` instead.

Removed helm options
~~~~~~~~~~~~~~~~~~~~
Expand Down
4 changes: 0 additions & 4 deletions daemon/cmd/daemon_main.go
View file
Open in desktop
Expand Up @@ -233,10 +233,6 @@ func init() {
flags.String(option.ConfigDir, "", `Configuration directory that contains a file for each option`)
option.BindEnv(option.ConfigDir)

flags.Uint(option.ConntrackGarbageCollectorIntervalDeprecated, 0, "Garbage collection interval for the connection tracking table (in seconds)")
flags.MarkDeprecated(option.ConntrackGarbageCollectorIntervalDeprecated, fmt.Sprintf("please use --%s", option.ConntrackGCInterval))
option.BindEnv(option.ConntrackGarbageCollectorIntervalDeprecated)

flags.Duration(option.ConntrackGCInterval, time.Duration(0), "Overwrite the connection-tracking garbage collection interval")
option.BindEnv(option.ConntrackGCInterval)

Expand Down
11 changes: 1 addition & 10 deletions pkg/option/config.go
View file
Open in desktop
Expand Up @@ -120,10 +120,6 @@ const (
// represents the value of that option.
ConfigDir = "config-dir"

// ConntrackGarbageCollectorIntervalDeprecated is the deprecated option
// name to set the conntrack gc interval
ConntrackGarbageCollectorIntervalDeprecated = "conntrack-garbage-collector-interval"

// ConntrackGCInterval is the name of the ConntrackGCInterval option
ConntrackGCInterval = "conntrack-gc-interval"

Expand Down Expand Up @@ -2307,6 +2303,7 @@ func (c *DaemonConfig) Populate() {
c.ClusterMeshConfig = viper.GetString(ClusterMeshConfigName)
c.CNPNodeStatusGCInterval = viper.GetDuration(CNPNodeStatusGCInterval)
c.CNPStatusUpdateInterval = viper.GetDuration(CNPStatusUpdateInterval)
c.ConntrackGCInterval = viper.GetDuration(ConntrackGCInterval)
c.DatapathMode = viper.GetString(DatapathMode)
c.Debug = viper.GetBool(DebugArg)
c.DebugVerbose = viper.GetStringSlice(DebugVerbose)
Expand Down Expand Up @@ -2547,12 +2544,6 @@ func (c *DaemonConfig) Populate() {
c.LogOpt = m
}

if val := viper.GetInt(ConntrackGarbageCollectorIntervalDeprecated); val != 0 {
c.ConntrackGCInterval = time.Duration(val) * time.Second
} else {
c.ConntrackGCInterval = viper.GetDuration(ConntrackGCInterval)
}

if val := viper.GetInt64(ENIParallelWorkersDeprecated); val != 0 {
c.ParallelAllocWorkers = val
} else {
Expand Down