Merge pull request #258 from keel-hq/feature/approvals_in_mem

Feature/approvals in mem

bot/slack/slack.go

@@ -206,7 +206,7 @@ func (b *Bot) handleMessage(event *slack.MessageEvent) {
 			"event_user":    event.User,
 			"msg":           event.Text,
 			"event_subtype": event.SubType,
-		}).Info("handleMessage: ignoring message")
+		}).Debug("handleMessage: ignoring message")
 		return
 	}
 

cmd/keel/main.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/keel-hq/keel/approvals"
 	"github.com/keel-hq/keel/bot"
-	"github.com/keel-hq/keel/cache/kubekv"
+	"github.com/keel-hq/keel/cache/memory"
 
 	"github.com/keel-hq/keel/constants"
 	"github.com/keel-hq/keel/extension/credentialshelper"
@@ -156,21 +156,10 @@ func main() {
 	k8s.WatchStatefulSets(&g, implementer.Client(), wl, buf)
 	k8s.WatchDaemonSets(&g, implementer.Client(), wl, buf)
 
-	keelsNamespace := constants.DefaultNamespace
-	if os.Getenv(EnvNamespace) != "" {
-		keelsNamespace = os.Getenv(EnvNamespace)
-	}
-
-	kkv, err := kubekv.New(implementer.ConfigMaps(keelsNamespace), "approvals")
-	if err != nil {
-		log.WithFields(log.Fields{
-			"error":     err,
-			"namespace": keelsNamespace,
-		}).Fatal("main: failed to initialise kube-kv")
-	}
+	approvalsCache := memory.NewMemoryCache(24*time.Hour, 24*time.Hour, 10*time.Second)
 
 	serializer := codecs.DefaultSerializer()
-	approvalsManager := approvals.New(kkv, serializer)
+	approvalsManager := approvals.New(approvalsCache, serializer)
 
 	go approvalsManager.StartExpiryService(ctx)
 

extension/credentialshelper/aws/aws.go

@@ -4,9 +4,9 @@ import (
 	"encoding/base64"
 	"fmt"
 	"net/url"
+	"regexp"
 	"strings"
 	"time"
-	"regexp"
 
 	// "github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws"
@@ -24,6 +24,7 @@ import (
 // This is required to reduce chance of hiting rate limits,
 // more info here: https://docs.aws.amazon.com/AmazonECR/latest/userguide/service_limits.html
 const AWSCredentialsExpiry = 2 * time.Hour
+
 var registryRegxp *regexp.Regexp
 
 func init() {
@@ -46,9 +47,7 @@ type CredentialsHelper struct {
 func New() *CredentialsHelper {
 	ch := &CredentialsHelper{}
 	ch.enabled = true
-	log.Infof("extension.credentialshelper.aws: enabled")
 	ch.cache = NewCache(AWSCredentialsExpiry)
-
 	return ch
 }
 
@@ -167,4 +166,3 @@ func parseRegistry(registry string) (registryID string, region string, err error
 
 	return registryParsed["registryID"], registryParsed["region"], nil
 }
-

extension/credentialshelper/credentialshelper.go

@@ -95,6 +95,6 @@ func GetCredentials(image *types.TrackedImage) (creds *types.Credentials) {
 	}
 	log.WithFields(log.Fields{
 		"tracked_image": image,
-	}).Error("extension.credentialshelper: credentials helper not found")
+	}).Debug("extension.credentialshelper: credentials helper not found")
 	return creds
 }

extension/notification/notification.go

@@ -68,7 +68,7 @@ func RegisterSender(name string, s Sender) {
 
 	log.WithFields(log.Fields{
 		"name": name,
-	}).Info("extension.notification: sender registered")
+	}).Debug("extension.notification: sender registered")
 
 	senders[name] = s
 }