Merge pull request #73 from rusenask/develop

Develop

bot/bot.go

@@ -152,7 +152,6 @@ func (b *Bot) handleMessage(event *slack.MessageEvent) {
 
 	// All messages past this point are directed to @gopher itself
 	if !b.isBotMessage(event, eventText) {
-		log.Info("not a bot message")
 		return
 	}
 

provider/helm/common.go

@@ -12,6 +12,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 )
 
+// ErrKeelConfigNotFound - default error when keel configuration for chart is not defined
 var ErrKeelConfigNotFound = errors.New("keel configuration not found")
 
 // getImages - get images from chart values
@@ -44,19 +45,6 @@ func getImages(vals chartutil.Values) ([]*types.TrackedImage, error) {
 			Trigger:      keelCfg.Trigger,
 		}
 
-		if imageDetails.ImagePullSecretPath != "" {
-			secretName, err := getValueAsString(vals, imageDetails.ImagePullSecretPath)
-			if err != nil {
-				log.WithFields(log.Fields{
-					"error":           err,
-					"repository_name": imageDetails.RepositoryPath,
-					"repository_tag":  imageDetails.TagPath,
-				}).Warn("provider.helm: image pull secret was defined but failed to get it from values.yaml")
-			} else {
-				trackedImage.Secrets = []string{secretName}
-			}
-		}
-
 		images = append(images, trackedImage)
 	}
 

provider/helm/common_test.go

@@ -27,57 +27,10 @@ keel:
 
 `
 
-var chartValuesBSecret = `
---- 
-image: 
-  imagePullSecret: muchsecrecy
-  repository: gcr.io/v2-namespace/hello-world
-  tag: "1.1.0"
-keel: 
-  images: 
-    - 
-      imagePullSecret: image.imagePullSecret
-      repository: image.repository
-      tag: image.tag
-  policy: all
-  trigger: poll
-name: "al Rashid"
-where: 
-  city: Basrah
-  title: caliph`
-
-var chartValuesBSecretNoPath = `
---- 
-image:   
-  repository: gcr.io/v2-namespace/hello-world
-  tag: "1.1.0"
-keel: 
-  images: 
-    - 
-      imagePullSecret: image.imagePullSecret
-      repository: image.repository
-      tag: image.tag
-  policy: all
-  trigger: poll
-name: "al Rashid"
-where: 
-  city: Basrah
-  title: caliph`
-
 func Test_getImages(t *testing.T) {
 	vals, _ := chartutil.ReadValues([]byte(chartValuesA))
 	img, _ := image.Parse("gcr.io/v2-namespace/hello-world:1.1.0")
 
-	valsSecret, err := chartutil.ReadValues([]byte(chartValuesBSecret))
-	if err != nil {
-		t.Fatalf("failed to parse chartValuesBSecret")
-	}
-
-	valsSecretNoPath, err := chartutil.ReadValues([]byte(chartValuesBSecretNoPath))
-	if err != nil {
-		t.Fatalf("failed to parse chartValuesBSecretNoPath")
-	}
-
 	type args struct {
 		vals chartutil.Values
 	}
@@ -100,33 +53,6 @@ func Test_getImages(t *testing.T) {
 			},
 			wantErr: false,
 		},
-		{
-			name: "hello-world image with secrets",
-			args: args{
-				vals: valsSecret,
-			},
-			want: []*types.TrackedImage{
-				&types.TrackedImage{
-					Image:   img,
-					Trigger: types.TriggerTypePoll,
-					Secrets: []string{"muchsecrecy"},
-				},
-			},
-			wantErr: false,
-		},
-		{
-			name: "hello-world image with secret but no actual value",
-			args: args{
-				vals: valsSecretNoPath,
-			},
-			want: []*types.TrackedImage{
-				&types.TrackedImage{
-					Image:   img,
-					Trigger: types.TriggerTypePoll,
-				},
-			},
-			wantErr: false,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

provider/helm/helm.go

@@ -70,9 +70,8 @@ type KeelChartConfig struct {
 
 // ImageDetails - image details
 type ImageDetails struct {
-	RepositoryPath      string `json:"repository"`
-	TagPath             string `json:"tag"`
-	ImagePullSecretPath string `json:"imagePullSecret"`
+	RepositoryPath string `json:"repository"`
+	TagPath        string `json:"tag"`
 }
 
 // Provider - helm provider, responsible for managing release updates
@@ -150,6 +149,8 @@ func (p *Provider) TrackedImages() ([]*types.TrackedImage, error) {
 		if cfg.PollSchedule == "" {
 			cfg.PollSchedule = types.KeelPollDefaultSchedule
 		}
+		// used to check pod secrets
+		selector := fmt.Sprintf("app=%s,release=%s", release.Chart.Metadata.Name, release.Name)
 
 		releaseImages, err := getImages(vals)
 		if err != nil {
@@ -162,6 +163,9 @@ func (p *Provider) TrackedImages() ([]*types.TrackedImage, error) {
 		}
 
 		for _, img := range releaseImages {
+			img.Meta = map[string]string{
+				"selector": selector,
+			}
 			img.Namespace = release.Namespace
 			img.Provider = ProviderName
 			trackedImages = append(trackedImages, img)
@@ -235,6 +239,7 @@ func (p *Provider) createUpdatePlans(event *types.Event) ([]*UpdatePlan, error)
 
 			log.WithFields(log.Fields{
 				"error": err,
+				"tag":   event.Repository.Tag,
 			}).Error("provider.helm: failed to parse version")
 			continue
 		}

provider/helm/helm_test.go

@@ -1,7 +1,6 @@
 package helm
 
 import (
-	"fmt"
 	"reflect"
 	"testing"
 
@@ -90,7 +89,8 @@ keel:
 				&hapi_release5.Release{
 					Name: "release-1",
 					Chart: &chart.Chart{
-						Values: &chart.Config{Raw: chartVals},
+						Values:   &chart.Config{Raw: chartVals},
+						Metadata: &chart.Metadata{Name: "app-x"},
 					},
 					Config: &chart.Config{Raw: ""},
 				},
@@ -117,8 +117,6 @@ keel:
 			t.Errorf("failed to get image paths: %s", err)
 		}
 
-		fmt.Println(cfg)
-
 		if cfg.Policy == types.PolicyTypeAll {
 			policyFound = true
 		}
@@ -159,7 +157,8 @@ keel:
 				&hapi_release5.Release{
 					Name: "release-1",
 					Chart: &chart.Chart{
-						Values: &chart.Config{Raw: chartVals},
+						Values:   &chart.Config{Raw: chartVals},
+						Metadata: &chart.Metadata{Name: "app-x"},
 					},
 					Config: &chart.Config{Raw: ""},
 				},
@@ -206,7 +205,8 @@ keel:
 				&hapi_release5.Release{
 					Name: "release-1",
 					Chart: &chart.Chart{
-						Values: &chart.Config{Raw: chartVals},
+						Values:   &chart.Config{Raw: chartVals},
+						Metadata: &chart.Metadata{Name: "app-x"},
 					},
 					Config: &chart.Config{Raw: ""},
 				},

provider/helm/unversioned_updates.go

@@ -1,8 +1,6 @@
 package helm
 
 import (
-	"fmt"
-
 	"github.com/rusenask/keel/types"
 	"github.com/rusenask/keel/util/image"
 
@@ -54,7 +52,6 @@ func checkUnversionedRelease(repo *types.Repository, namespace, name string, cha
 
 	// checking for impacted images
 	for _, imageDetails := range keelCfg.Images {
-		fmt.Println(imageDetails.TagPath)
 
 		imageRef, err := parseImage(vals, &imageDetails)
 		if err != nil {
@@ -66,8 +63,6 @@ func checkUnversionedRelease(repo *types.Repository, namespace, name string, cha
 			continue
 		}
 
-		fmt.Println(imageRef.Repository())
-
 		if imageRef.Repository() != eventRepoRef.Repository() {
 			log.WithFields(log.Fields{
 				"parsed_image_name": imageRef.Remote(),

provider/helm/versioned_updates.go

@@ -1,8 +1,6 @@
 package helm
 
 import (
-	"fmt"
-
 	"github.com/rusenask/keel/types"
 	"github.com/rusenask/keel/util/image"
 	"github.com/rusenask/keel/util/version"
@@ -48,7 +46,6 @@ func checkVersionedRelease(newVersion *types.Version, repo *types.Repository, na
 	}
 	// checking for impacted images
 	for _, imageDetails := range keelCfg.Images {
-		fmt.Println(imageDetails.TagPath)
 
 		imageRef, err := parseImage(vals, &imageDetails)
 		if err != nil {
@@ -60,8 +57,6 @@ func checkVersionedRelease(newVersion *types.Version, repo *types.Repository, na
 			continue
 		}
 
-		fmt.Println(imageRef.Repository())
-
 		if imageRef.Repository() != eventRepoRef.Repository() {
 			log.WithFields(log.Fields{
 				"parsed_image_name": imageRef.Remote(),

provider/kubernetes/implementer.go

@@ -20,6 +20,7 @@ type Implementer interface {
 	Deployments(namespace string) (*v1beta1.DeploymentList, error)
 	Update(deployment *v1beta1.Deployment) error
 	Secret(namespace, name string) (*v1.Secret, error)
+	Pods(namespace, labelSelector string) (*v1.PodList, error)
 }
 
 // KubernetesImplementer - default kubernetes client implementer, uses
@@ -101,6 +102,13 @@ func (i *KubernetesImplementer) Update(deployment *v1beta1.Deployment) error {
 	return err
 }
 
+// Secret - get secret
 func (i *KubernetesImplementer) Secret(namespace, name string) (*v1.Secret, error) {
+
 	return i.client.Secrets(namespace).Get(name, meta_v1.GetOptions{})
 }
+
+// Pods - get pods
+func (i *KubernetesImplementer) Pods(namespace, labelSelector string) (*v1.PodList, error) {
+	return i.client.Pods(namespace).List(meta_v1.ListOptions{LabelSelector: labelSelector})
+}

provider/kubernetes/kubernetes_test.go

@@ -16,6 +16,8 @@ type fakeImplementer struct {
 	deployment     *v1beta1.Deployment
 	deploymentList *v1beta1.DeploymentList
 
+	podList *v1.PodList
+
 	// stores value of an updated deployment
 	updated *v1beta1.Deployment
 
@@ -43,6 +45,10 @@ func (i *fakeImplementer) Secret(namespace, name string) (*v1.Secret, error) {
 	return i.availableSecret, nil
 }
 
+func (i *fakeImplementer) Pods(namespace, labelSelector string) (*v1.PodList, error) {
+	return i.podList, nil
+}
+
 type fakeSender struct {
 	sentEvent types.EventNotification
 }

secrets/secrets.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"net/url"
 
+	"github.com/rusenask/keel/provider/helm"
 	"github.com/rusenask/keel/provider/kubernetes"
 	"github.com/rusenask/keel/types"
 
@@ -40,12 +41,51 @@ func (g *DefaultGetter) Get(image *types.TrackedImage) (*types.Credentials, erro
 		return nil, ErrNamespaceNotSpecified
 	}
 
-	if len(image.Secrets) == 0 {
-		return nil, ErrSecretsNotSpecified
+	switch image.Provider {
+	case helm.ProviderName:
+		// looking up secrets based on selector
+		secrets, err := g.lookupSecrets(image)
+		if err != nil {
+			return nil, err
+		}
+
+		// populating secrets
+		image.Secrets = secrets
 	}
+
 	return g.getCredentialsFromSecret(image)
 }
 
+func (g *DefaultGetter) lookupSecrets(image *types.TrackedImage) ([]string, error) {
+	secrets := []string{}
+
+	selector, ok := image.Meta["selector"]
+	if !ok {
+		// nothing
+		return secrets, nil
+	}
+
+	podList, err := g.kubernetesImplementer.Pods(image.Namespace, selector)
+	if err != nil {
+		return secrets, err
+	}
+
+	for _, pod := range podList.Items {
+		podSecrets := getPodImagePullSecrets(&pod)
+		secrets = append(secrets, podSecrets...)
+	}
+
+	return secrets, nil
+}
+
+func getPodImagePullSecrets(pod *v1.Pod) []string {
+	var secrets []string
+	for _, s := range pod.Spec.ImagePullSecrets {
+		secrets = append(secrets, s.Name)
+	}
+	return secrets
+}
+
 func (g *DefaultGetter) getCredentialsFromSecret(image *types.TrackedImage) (*types.Credentials, error) {
 
 	credentials := &types.Credentials{}
@@ -112,12 +152,16 @@ func (g *DefaultGetter) getCredentialsFromSecret(image *types.TrackedImage) (*ty
 			if h == image.Image.Registry() {
 				credentials.Username = auth.Username
 				credentials.Password = auth.Password
+
+				log.WithFields(log.Fields{
+					"namespace": image.Namespace,
+					"provider":  image.Provider,
+					"registry":  image.Image.Registry(),
+					"image":     image.Image.Repository(),
+				}).Info("secrets.defaultGetter: secret looked up successfully")
+
 				return credentials, nil
 			}
-			log.WithFields(log.Fields{
-				"registry": registry,
-				"want":     image.Image.Registry(),
-			}).Info("scanning registries")
 		}
 
 	}