keel-hq
/
keel
mirror of https://github.com/keel-hq/keel/tree/master/chart/keel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:keel-hq/keel

pull/197/head
alonisser 2018-04-18 20:45:33 +03:00
parent d1e813bc92 1816497a9c
commit c344f5f0d3
5 changed files with 224 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
provider/helm/unversioned_updates.go
View File

@ -18,7 +18,7 @@ func checkUnversionedRelease(repo *types.Repository, namespace, name string, cha
Values: make(map[string]string),
}
eventRepoRef, err := image.Parse(repo.Name)
eventRepoRef, err := image.Parse(repo.String())
if err != nil {
log.WithFields(log.Fields{
"error": err,

17
provider/kubernetes/unversioned_updates.go
View File

@ -7,6 +7,7 @@ import (
"github.com/keel-hq/keel/types"
"github.com/keel-hq/keel/util/image"
"github.com/keel-hq/keel/util/timeutil"
log "github.com/sirupsen/logrus"
)
@ -14,7 +15,7 @@ import (
func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *types.Repository, deployment v1beta1.Deployment) (updatePlan *UpdatePlan, shouldUpdateDeployment bool, err error) {
updatePlan = &UpdatePlan{}
eventRepoRef, err := image.Parse(repo.Name)
eventRepoRef, err := image.Parse(repo.String())
if err != nil {
return
}
@ -70,6 +71,18 @@ func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *typ
}
}
// updating annotations
annotations := deployment.GetAnnotations()
if _, ok := annotations[types.KeelForceTagMatchLabel]; ok {
if containerImageRef.Tag() != eventRepoRef.Tag() {
continue
}
if deployment.Spec.Template.Annotations == nil {
deployment.Spec.Template.Annotations = map[string]string{}
}
deployment.Spec.Template.Annotations["time"] = timeutil.Now().String()
}
// updating image
if containerImageRef.Registry() == image.DefaultRegistryHostname {
c.Image = fmt.Sprintf("%s:%s", containerImageRef.ShortName(), repo.Tag)
@ -81,8 +94,6 @@ func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *typ
// marking this deployment for update
shouldUpdateDeployment = true
// updating annotations
annotations := deployment.GetAnnotations()
// updating digest if available
if repo.Digest != "" {

190
provider/kubernetes/unversioned_updates_test.go
View File

@ -3,16 +3,24 @@ package kubernetes
import (
"reflect"
"testing"
"time"
"github.com/keel-hq/keel/approvals"
"github.com/keel-hq/keel/extension/notification"
"github.com/keel-hq/keel/types"
"github.com/keel-hq/keel/util/timeutil"
"k8s.io/api/core/v1"
"k8s.io/api/extensions/v1beta1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
func TestProvider_checkUnversionedDeployment(t *testing.T) {
timeutil.Now = func() time.Time {
return time.Date(0, 0, 0, 0, 0, 0, 0, time.UTC)
}
defer func() { timeutil.Now = time.Now }()
type fields struct {
implementer Implementer
sender notification.Sender
@ -271,6 +279,182 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
wantShouldUpdateDeployment: true,
wantErr: false,
},
{
name: "poll trigger, force-match, same tag",
args: args{
policy: types.PolicyTypeForce,
repo: &types.Repository{Name: "karolisr/keel", Tag: "latest-staging"},
deployment: v1beta1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Labels: map[string]string{types.KeelPolicyLabel: "force"},
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
},
},
v1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "karolisr/keel:latest-staging",
},
},
},
},
},
v1beta1.DeploymentStatus{},
},
},
wantUpdatePlan: &UpdatePlan{
Deployment: v1beta1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
forceUpdateImageAnnotation: "karolisr/keel:latest-staging",
},
Labels: map[string]string{types.KeelPolicyLabel: "force"},
},
v1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: meta_v1.ObjectMeta{
Annotations: map[string]string{
"time": timeutil.Now().String(),
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "karolisr/keel:latest-staging",
},
},
},
},
},
v1beta1.DeploymentStatus{},
},
NewVersion: "latest-staging",
CurrentVersion: "latest-staging",
},
wantShouldUpdateDeployment: true,
wantErr: false,
},
{
name: "poll trigger, force-match, same tag on eu.gcr.io",
args: args{
policy: types.PolicyTypeForce,
repo: &types.Repository{Host: "eu.gcr.io", Name: "karolisr/keel", Tag: "latest-staging"},
deployment: v1beta1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Labels: map[string]string{types.KeelPolicyLabel: "force"},
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
},
},
v1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: meta_v1.ObjectMeta{
Annotations: map[string]string{
"this": "that",
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "eu.gcr.io/karolisr/keel:latest-staging",
},
},
},
},
},
v1beta1.DeploymentStatus{},
},
},
wantUpdatePlan: &UpdatePlan{
Deployment: v1beta1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
forceUpdateImageAnnotation: "eu.gcr.io/karolisr/keel:latest-staging",
},
Labels: map[string]string{types.KeelPolicyLabel: "force"},
},
v1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: meta_v1.ObjectMeta{
Annotations: map[string]string{
"this": "that",
"time": timeutil.Now().String(),
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "eu.gcr.io/karolisr/keel:latest-staging",
},
},
},
},
},
v1beta1.DeploymentStatus{},
},
NewVersion: "latest-staging",
CurrentVersion: "latest-staging",
},
wantShouldUpdateDeployment: true,
wantErr: false,
},
{
name: "poll trigger, force-match, different tag",
args: args{
policy: types.PolicyTypeForce,
repo: &types.Repository{Name: "karolisr/keel", Tag: "latest-staging"},
deployment: v1beta1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule},
Labels: map[string]string{types.KeelPolicyLabel: "force"},
},
v1beta1.DeploymentSpec{
Template: v1.PodTemplateSpec{
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "karolisr/keel:latest-acceptance",
},
},
},
},
},
v1beta1.DeploymentStatus{},
},
},
wantUpdatePlan: &UpdatePlan{
Deployment: v1beta1.Deployment{},
},
wantShouldUpdateDeployment: false,
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@ -283,14 +467,14 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
}
gotUpdatePlan, gotShouldUpdateDeployment, err := p.checkUnversionedDeployment(tt.args.policy, tt.args.repo, tt.args.deployment)
if (err != nil) != tt.wantErr {
t.Errorf("Provider.checkUnversionedDeployment() error = %v, wantErr %v", err, tt.wantErr)
t.Errorf("Provider.checkUnversionedDeployment() error = %#v, wantErr %#v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(gotUpdatePlan, tt.wantUpdatePlan) {
t.Errorf("Provider.checkUnversionedDeployment() gotUpdatePlan = %v, want %v", gotUpdatePlan, tt.wantUpdatePlan)
t.Errorf("Provider.checkUnversionedDeployment() gotUpdatePlan = %#v, want %#v", gotUpdatePlan, tt.wantUpdatePlan)
}
if gotShouldUpdateDeployment != tt.wantShouldUpdateDeployment {
t.Errorf("Provider.checkUnversionedDeployment() gotShouldUpdateDeployment = %v, want %v", gotShouldUpdateDeployment, tt.wantShouldUpdateDeployment)
t.Errorf("Provider.checkUnversionedDeployment() gotShouldUpdateDeployment = %#v, want %#v", gotShouldUpdateDeployment, tt.wantShouldUpdateDeployment)
}
})
}

16
types/types.go
View File

@ -25,6 +25,8 @@ const KeelPolicyLabel = "keel.sh/policy"
// changes
const KeelTriggerLabel = "keel.sh/trigger"
const KeelForceTagMatchLabel = "keel.sh/match-tag"
// KeelPollScheduleAnnotation - optional variable to setup custom schedule for polling, defaults to @every 10m
const KeelPollScheduleAnnotation = "keel.sh/pollSchedule"
@ -67,6 +69,20 @@ type Repository struct {
Digest string `json:"digest"` // optional digest field
}
// String gives you [host/]team/repo[:tag] identifier
func (r *Repository) String() string {
b := bytes.NewBufferString(r.Host)
if b.Len() != 0 {
b.WriteRune('/')
}
b.WriteString(r.Name)
if r.Tag != "" {
b.WriteRune(':')
b.WriteString(r.Tag)
}
return b.String()
}
// Event - holds information about new event from trigger
type Event struct {
Repository Repository `json:"repository,omitempty"`

6
util/timeutil/now.go Normal file
View File

@ -0,0 +1,6 @@
package timeutil
import "time"
//Now utility, to replace for testing
var Now = time.Now