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

Add redis ssl #540

Merged
merged 4 commits into from
Jan 28, 2020
Merged

Add redis ssl #540

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecc5ce4
Add tls parameter to redis config struct
inuyasha82 Jan 8, 2020
039ce36
Add enableTLS parameter to redis-scaler
inuyasha82 Jan 13, 2020
f1184ab
Merge branch 'master' into add_redis_ssl
gallomas Jan 23, 2020
841d757
Remove debug print
inuyasha82 Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions pkg/scalers/redis_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package scalers

import (
"context"
"crypto/tls"
"fmt"
"strconv"

Expand Down Expand Up @@ -30,6 +31,7 @@ type redisMetadata struct {
listName string
address string
password string
enableTLS bool
}

var redisLog = logf.Log.WithName("redis_scaler")
Expand Down Expand Up @@ -84,13 +86,23 @@ func parseRedisMetadata(metadata, resolvedEnv, authParams map[string]string) (*r
}
}

meta.enableTLS = false
if val, ok := metadata["enableTLS"]; ok {
tls, err := strconv.ParseBool(val)
if err != nil {
return nil, fmt.Errorf("enableTLS parsing error %s", err.Error())
}
meta.enableTLS = tls
}

return &meta, nil
}

// IsActive checks if there is any element in the Redis list
func (s *redisScaler) IsActive(ctx context.Context) (bool, error) {

length, err := getRedisListLength(
ctx, s.metadata.address, s.metadata.password, s.metadata.listName)
ctx, s.metadata.address, s.metadata.password, s.metadata.listName, s.metadata.enableTLS)

if err != nil {
redisLog.Error(err, "error")
Expand All @@ -114,7 +126,7 @@ func (s *redisScaler) GetMetricSpecForScaling() []v2beta1.MetricSpec {

// GetMetrics connects to Redis and finds the length of the list
func (s *redisScaler) GetMetrics(ctx context.Context, metricName string, metricSelector labels.Selector) ([]external_metrics.ExternalMetricValue, error) {
listLen, err := getRedisListLength(ctx, s.metadata.address, s.metadata.password, s.metadata.listName)
listLen, err := getRedisListLength(ctx, s.metadata.address, s.metadata.password, s.metadata.listName, s.metadata.enableTLS)

if err != nil {
redisLog.Error(err, "error getting list length")
Expand All @@ -130,18 +142,25 @@ func (s *redisScaler) GetMetrics(ctx context.Context, metricName string, metricS
return append([]external_metrics.ExternalMetricValue{}, metric), nil
}

func getRedisListLength(ctx context.Context, address string, password string, listName string) (int64, error) {
client := redis.NewClient(&redis.Options{
func getRedisListLength(ctx context.Context, address string, password string, listName string, enableTLS bool) (int64, error) {
options := &redis.Options{
Addr: address,
Password: password,
DB: 0,
})
}

if enableTLS == true {
options.TLSConfig = &tls.Config{
InsecureSkipVerify: enableTLS,
}
}

client := redis.NewClient(options)

cmd := client.LLen(listName)

if cmd.Err() != nil {
return -1, cmd.Err()
}

return cmd.Result()
}