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 pull request #205 from azr/fix/check-force-tag-true 

force match tag uses label ( & not annotation ) + make sure it's explicitly "true"
feature/tests
Karolis Rusenas 2018-05-05 19:53:02 +02:00 committed by GitHub
parent 0096ccc44d 050308cdf1
commit 9b88d6948b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
provider/kubernetes/unversioned_updates.go
View File

@ -71,10 +71,8 @@ func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *typ
}
// updating annotations
// annotations := resource.GetAnnotations()
matchTag, ok := annotations[types.KeelForceTagMatchLabel]
if ok {
if matchTag != "" && containerImageRef.Tag() != eventRepoRef.Tag() {
if matchTag, _ := labels[types.KeelForceTagMatchLabel]; matchTag == "true" {
if containerImageRef.Tag() != eventRepoRef.Tag() {
continue
}
}

53
provider/kubernetes/unversioned_updates_test.go
View File

@ -313,7 +313,7 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
},
{
name: "poll trigger, force-match, same tag",
name: "pubsub trigger, force-match, same tag",
args: args{
policy: types.PolicyTypeForce,
repo: &types.Repository{Name: "karolisr/keel", Tag: "latest-staging"},
@ -322,10 +322,9 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
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",
Labels: map[string]string{
types.KeelPolicyLabel: "force",
types.KeelForceTagMatchLabel: "true",
},
},
apps_v1.DeploymentSpec{
@ -353,11 +352,10 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
Labels: map[string]string{
types.KeelForceTagMatchLabel: "true",
types.KeelPolicyLabel: "force",
},
Labels: map[string]string{types.KeelPolicyLabel: "force"},
},
apps_v1.DeploymentSpec{
Template: v1.PodTemplateSpec{
@ -385,7 +383,7 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
},
{
name: "poll trigger, force-match, same tag on eu.gcr.io",
name: "pubsub 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"},
@ -394,10 +392,9 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
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",
Labels: map[string]string{
types.KeelPolicyLabel: "force",
types.KeelForceTagMatchLabel: "true",
},
},
apps_v1.DeploymentSpec{
@ -425,11 +422,10 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
Labels: map[string]string{
types.KeelForceTagMatchLabel: "true",
types.KeelPolicyLabel: "force",
},
Labels: map[string]string{types.KeelPolicyLabel: "force"},
},
apps_v1.DeploymentSpec{
Template: v1.PodTemplateSpec{
@ -457,21 +453,22 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
wantErr: false,
},
{
name: "poll trigger, force-match, different tag",
name: "pubsub trigger, force-match, different tag",
args: args{
policy: types.PolicyTypeForce,
repo: &types.Repository{Name: "karolisr/keel", Tag: "latest-staging"},
resource: MustParseGR(&apps_v1.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"},
Name: "dep-1",
Namespace: "xxxx",
Labels: map[string]string{
types.KeelPolicyLabel: "force",
types.KeelForceTagMatchLabel: "true",
},
},
apps_v1.DeploymentSpec{
Template: v1.PodTemplateSpec{
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
@ -491,7 +488,7 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
wantErr: false,
},
{
name: "poll trigger, force-match, same tag on eu.gcr.io, daemonset",
name: "pubsub trigger, force-match, same tag on eu.gcr.io, daemonset",
args: args{
policy: types.PolicyTypeForce,
repo: &types.Repository{Host: "eu.gcr.io", Name: "karolisr/keel", Tag: "latest-staging"},
@ -502,8 +499,7 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
Namespace: "xxxx",
Labels: map[string]string{types.KeelPolicyLabel: "force"},
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
types.KeelForceTagMatchLabel: "true",
},
},
apps_v1.DaemonSetSpec{
@ -532,8 +528,7 @@ func TestProvider_checkUnversionedDeployment(t *testing.T) {
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{
types.KeelPollScheduleAnnotation: types.KeelPollDefaultSchedule,
types.KeelForceTagMatchLabel: "yup",
types.KeelForceTagMatchLabel: "true",
},
Labels: map[string]string{types.KeelPolicyLabel: "force"},
},