Skip to content

Commit

Permalink
Merge pull request #2896 from sbueringer/pr-disable-keepalive
Browse files Browse the repository at this point in the history
🌱 Deprecate and disable keep alive handler for vSphere sessions
  • Loading branch information
k8s-ci-robot authored Apr 9, 2024
2 parents e7a9760 + 805ca90 commit 436bf55
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ func InitFlags(fs *pflag.FlagSet) {
&managerOpts.EnableKeepAlive,
"enable-keep-alive",
defaultEnableKeepAlive,
"feature to enable keep alive handler in vsphere sessions. This functionality is enabled by default.")
"feature to enable keep alive handler in vsphere sessions. This functionality is disabled by default.")
_ = fs.MarkDeprecated("enable-keep-alive", "This flag has been deprecated and will be removed in a "+
"future release. Note: This feature has been disabled per default because we determined that we already keep alive "+
"sessions just by our regular reconciles. So we don't need an additional keep alive handler. Enabling "+
"this feature may lead to a deadlock in controllers communicating with vCenter.")
fs.DurationVar(
&managerOpts.KeepAliveDuration,
"keep-alive-duration",
Expand Down
4 changes: 2 additions & 2 deletions pkg/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ const (
// cluster are in maintenance mode.
MaintenanceAnnotationLabel = "capv." + infrav1.GroupName + "/maintenance"

// DefaultEnableKeepAlive is true by default.
DefaultEnableKeepAlive = true
// DefaultEnableKeepAlive is false by default.
DefaultEnableKeepAlive = false

// DefaultKeepAliveDuration unit minutes.
DefaultKeepAliveDuration = time.Minute * 5
Expand Down

0 comments on commit 436bf55

Please sign in to comment.