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

switching to use plans

pull/99/head
Karolis Rusenas 2017-08-16 23:10:28 +01:00
parent d3b6c0f179
commit 21095ef786
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
provider/kubernetes/unversioned_updates.go
View File

@ -11,7 +11,10 @@ import (
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
) )
func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *types.Repository, deployment v1beta1.Deployment) (updated v1beta1.Deployment, shouldUpdateDeployment bool, err error) { // func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *types.Repository, deployment v1beta1.Deployment) (updated v1beta1.Deployment, shouldUpdateDeployment bool, err error) {
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.Name)
if err != nil { if err != nil {
return return
@ -82,6 +85,10 @@ func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *typ
deployment.SetAnnotations(annotations) deployment.SetAnnotations(annotations)
updatePlan.CurrentVersion = containerImageRef.Tag()
updatePlan.NewVersion = repo.Tag
updatePlan.Deployment = deployment
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"parsed_image": containerImageRef.Remote(), "parsed_image": containerImageRef.Remote(),
"raw_image_name": c.Image, "raw_image_name": c.Image,
@ -92,5 +99,5 @@ func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *typ
} }
return deployment, shouldUpdateDeployment, nil return updatePlan, shouldUpdateDeployment, nil
} }

11
provider/kubernetes/versioned_updates.go
View File

@ -14,7 +14,10 @@ import (
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
) )
func (p *Provider) checkVersionedDeployment(newVersion *types.Version, policy types.PolicyType, repo *types.Repository, deployment v1beta1.Deployment) (updated v1beta1.Deployment, shouldUpdateDeployment bool, err error) { // func (p *Provider) checkVersionedDeployment(newVersion *types.Version, policy types.PolicyType, repo *types.Repository, deployment v1beta1.Deployment) (updated v1beta1.Deployment, shouldUpdateDeployment bool, err error) {
func (p *Provider) checkVersionedDeployment(newVersion *types.Version, 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.Name)
if err != nil { if err != nil {
return return
@ -148,6 +151,10 @@ func (p *Provider) checkVersionedDeployment(newVersion *types.Version, policy ty
} }
deployment.SetAnnotations(annotations) deployment.SetAnnotations(annotations)
updatePlan.CurrentVersion = currentVersion.Original
updatePlan.NewVersion = newVersion.Original
updatePlan.Deployment = deployment
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"parsed_image": conatinerImageRef.Remote(), "parsed_image": conatinerImageRef.Remote(),
"raw_image_name": c.Image, "raw_image_name": c.Image,
@ -158,7 +165,7 @@ func (p *Provider) checkVersionedDeployment(newVersion *types.Version, policy ty
} }
} }
return deployment, shouldUpdateDeployment, nil return updatePlan, shouldUpdateDeployment, nil
} }
func updateContainer(container v1.Container, ref *image.Reference, version string) v1.Container { func updateContainer(container v1.Container, ref *image.Reference, version string) v1.Container {