adding policy, removing some error messages

pull/318/head
Karolis Rusenas 2018-11-30 22:40:31 +00:00
parent 032b10bef1
commit 35d2800cc3
1 changed files with 10 additions and 6 deletions

View File

@ -17,8 +17,14 @@ var ErrKeelConfigNotFound = errors.New("keel configuration not found")
// getImages - get images from chart values
func getImages(vals chartutil.Values) ([]*types.TrackedImage, error) {
var images []*types.TrackedImage
keelCfg, err := getKeelConfig(vals)
if err != nil {
if err == ErrPolicyNotSpecified {
// nothing to do
return images, nil
}
log.WithFields(log.Fields{
"error": err,
}).Error("provider.helm: failed to get keel configuration for release")
@ -26,8 +32,6 @@ func getImages(vals chartutil.Values) ([]*types.TrackedImage, error) {
return nil, ErrKeelConfigNotFound
}
var images []*types.TrackedImage
for _, imageDetails := range keelCfg.Images {
imageRef, err := parseImage(vals, &imageDetails)
if err != nil {
@ -40,10 +44,10 @@ func getImages(vals chartutil.Values) ([]*types.TrackedImage, error) {
}
trackedImage := &types.TrackedImage{
Image: imageRef,
PollSchedule: keelCfg.PollSchedule,
Trigger: keelCfg.Trigger,
SemverPreReleaseTags: make(map[string]string),
Image: imageRef,
PollSchedule: keelCfg.PollSchedule,
Trigger: keelCfg.Trigger,
Policy: keelCfg.Plc,
}
images = append(images, trackedImage)