Skip to content

Commit

Permalink
Merge branch 'master' into slave_redis_haproxy
Browse files Browse the repository at this point in the history
  • Loading branch information
rurkss authored Jan 15, 2024
2 parents 62355af + b3a70fc commit 257640e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Also check this project's [releases](https://github.com/powerhome/redis-operator

### Fixed
- [Cleanup Sentinels when bootstrapping and sentinels are not allowed](https://github.com/powerhome/redis-operator/pull/33).
- [Prevent connection throttling for more than 256 concurrent client connections](https://github.com/powerhome/redis-operator/pull/36)

### Added
- [Bootstrap settings - Add an `enabled` parameter to toggle the bootstrap mode on or off for a RedisFailover. (Defaults to `true`)](https://github.com/powerhome/redis-operator/pull/32).
Expand Down
2 changes: 1 addition & 1 deletion operator/redisfailover/service/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func generateHAProxyConfigmap(rf *redisfailoverv1.RedisFailover, labels map[stri
port := rf.Spec.Redis.Port
haproxyCfg := fmt.Sprintf(`global
daemon
maxconn 256
maxconn 5000
defaults
mode tcp
Expand Down

0 comments on commit 257640e

Please sign in to comment.