Merge pull request #370 from keel-hq/feature/helm_issue_367

Feature/helm issue 367
keel-hq · Apr 23, 2019 · d6ba949 · d6ba949
2 parents 0241b8f + b93d462
commit d6ba949
Show file tree

Hide file tree

Showing 135 changed files with 11,192 additions and 446 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,6 +18,7 @@ jobs:
 
       # specify any bash command here prefixed with `run: `
       - run: make build
+      - run: go get github.com/mfridman/tparse
       - run: make test
   lint-scripts:
     docker:

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -103,19 +103,6 @@
   name="k8s.io/apimachinery"
   branch="release-1.9"
 
-# [[constraint]]
-#   name="k8s.io/client-go"
-#   branch="release-6.0"  
-
-# [[constraint]]
-#   name="k8s.io/api"
-#   branch="release-1.9"
-
-
-[[constraint]]
-  name = "k8s.io/helm"
-  version = "2.5.0"
-
 [prune]
   go-tests = true
   unused-packages = true

diff --git a/Makefile b/Makefile
@@ -44,7 +44,8 @@ aarch64:
 arm: build-binaries	compress fetch-certs armhf aarch64
 
 test:
-	go test -v `go list ./... | egrep -v /tests`
+	# go test -v `go list ./... | egrep -v /tests`
+	go test -json -v `go list ./... | egrep -v /tests` -cover | tparse -all -smallscreen
 
 build:
 	@echo "++ Building keel"

diff --git a/provider/helm/common.go b/provider/helm/common.go
@@ -50,6 +50,10 @@ func getImages(vals chartutil.Values) ([]*types.TrackedImage, error) {
 			Policy:       keelCfg.Plc,
 		}
 
+		if imageDetails.ImagePullSecret != "" {
+			trackedImage.Secrets = append(trackedImage.Secrets, imageDetails.ImagePullSecret)
+		}
+
 		images = append(images, trackedImage)
 	}