From 21095ef786caa90f6ac8dd43f63c9a924c585d9a Mon Sep 17 00:00:00 2001 From: Karolis Rusenas Date: Wed, 16 Aug 2017 23:10:28 +0100 Subject: [PATCH] switching to use plans --- provider/kubernetes/unversioned_updates.go | 11 +++++++++-- provider/kubernetes/versioned_updates.go | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/provider/kubernetes/unversioned_updates.go b/provider/kubernetes/unversioned_updates.go index 384d885c..db9ef141 100644 --- a/provider/kubernetes/unversioned_updates.go +++ b/provider/kubernetes/unversioned_updates.go @@ -11,7 +11,10 @@ import ( 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) if err != nil { return @@ -82,6 +85,10 @@ func (p *Provider) checkUnversionedDeployment(policy types.PolicyType, repo *typ deployment.SetAnnotations(annotations) + updatePlan.CurrentVersion = containerImageRef.Tag() + updatePlan.NewVersion = repo.Tag + updatePlan.Deployment = deployment + log.WithFields(log.Fields{ "parsed_image": containerImageRef.Remote(), "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 } diff --git a/provider/kubernetes/versioned_updates.go b/provider/kubernetes/versioned_updates.go index 40eb8f6d..f1907029 100644 --- a/provider/kubernetes/versioned_updates.go +++ b/provider/kubernetes/versioned_updates.go @@ -14,7 +14,10 @@ import ( 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) if err != nil { return @@ -148,6 +151,10 @@ func (p *Provider) checkVersionedDeployment(newVersion *types.Version, policy ty } deployment.SetAnnotations(annotations) + updatePlan.CurrentVersion = currentVersion.Original + updatePlan.NewVersion = newVersion.Original + updatePlan.Deployment = deployment + log.WithFields(log.Fields{ "parsed_image": conatinerImageRef.Remote(), "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 {