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

also check match-tag for versionned updates

pull/221/head
Adrien Delorme 2018-06-05 11:53:35 +02:00
parent bfbc9d9509
commit f5a86b7226
2 changed files with 130 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
provider/kubernetes/versioned_updates.go
View File

@ -70,6 +70,11 @@ func (p *Provider) checkVersionedDeployment(newVersion *types.Version, policy ty
// if policy is force, don't bother with version checking
// same with `latest` images, update them to versioned ones
if policy == types.PolicyTypeForce || containerImageRef.Tag() == "latest" {
if matchTag, _ := labels[types.KeelForceTagMatchLabel]; matchTag == "true" {
if containerImageRef.Tag() != eventRepoRef.Tag() {
continue
}
}
if containerImageRef.Registry() == image.DefaultRegistryHostname {
resource.UpdateContainer(idx, fmt.Sprintf("%s:%s", containerImageRef.ShortName(), newVersion.String()))
} else {

125
provider/kubernetes/versioned_updates_test.go
View File

@ -366,6 +366,131 @@ func TestProvider_checkVersionedDeployment(t *testing.T) {
wantShouldUpdateDeployment: true,
wantErr: false,
},
{
name: "force update untagged container - match tag",
args: args{
newVersion: unsafeGetVersion("1.1.2"),
policy: types.PolicyTypeForce,
repo: &types.Repository{Name: "gcr.io/v2-namespace/hello-world", Tag: "1.1.2"},
resource: MustParseGR(&apps_v1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{},
Labels: map[string]string{
types.KeelPolicyLabel: "force",
types.KeelForceTagMatchLabel: "true",
},
},
apps_v1.DeploymentSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: meta_v1.ObjectMeta{
Annotations: map[string]string{
"this": "that",
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "gcr.io/v2-namespace/hello-world:1.1.2",
},
v1.Container{
Image: "yo-world:1.1.1",
},
},
},
},
},
apps_v1.DeploymentStatus{},
}),
},
wantUpdatePlan: &UpdatePlan{
Resource: MustParseGR(&apps_v1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{},
Labels: map[string]string{
types.KeelPolicyLabel: "force",
types.KeelForceTagMatchLabel: "true",
},
},
apps_v1.DeploymentSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: meta_v1.ObjectMeta{
Annotations: map[string]string{
"this": "that",
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "gcr.io/v2-namespace/hello-world:1.1.2",
},
v1.Container{
Image: "yo-world:1.1.1",
},
},
},
},
},
apps_v1.DeploymentStatus{},
}),
NewVersion: "1.1.2",
CurrentVersion: "1.1.2",
},
wantShouldUpdateDeployment: true,
wantErr: false,
},
{
name: "don't force update untagged container - match tag",
args: args{
newVersion: unsafeGetVersion("1.1.3"),
policy: types.PolicyTypeForce,
repo: &types.Repository{Name: "gcr.io/v2-namespace/hello-world", Tag: "1.1.3"},
resource: MustParseGR(&apps_v1.Deployment{
meta_v1.TypeMeta{},
meta_v1.ObjectMeta{
Name: "dep-1",
Namespace: "xxxx",
Annotations: map[string]string{},
Labels: map[string]string{
types.KeelPolicyLabel: "force",
types.KeelForceTagMatchLabel: "true",
},
},
apps_v1.DeploymentSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: meta_v1.ObjectMeta{
Annotations: map[string]string{
"this": "that",
},
},
Spec: v1.PodSpec{
Containers: []v1.Container{
v1.Container{
Image: "gcr.io/v2-namespace/hello-world:1.1.2",
},
v1.Container{
Image: "yo-world:1.1.1",
},
},
},
},
},
apps_v1.DeploymentStatus{},
}),
},
wantUpdatePlan: &UpdatePlan{
Resource: nil,
NewVersion: "",
CurrentVersion: "",
},
wantShouldUpdateDeployment: false,
wantErr: false,
},
}
for _, tt := range tests {