Merge pull request #54 from manifoldco/better-sync-behaviour

Correct syncing behaviour
manifoldco · Jun 5, 2018 · 839c2ab · 839c2ab
2 parents a15ffef + 960a442
commit 839c2ab
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 95 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/githubrepository/controller.go b/pkg/githubrepository/controller.go
@@ -26,11 +26,6 @@ import (
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
-func init() {
-	// let's not hit rate limits
-	kubekit.ResyncPeriod = 30 * time.Second
-}
-
 // Controller will take care of syncing the internal status of the GitHub Policy
 // object with the available releases on GitHub.
 type Controller struct {
@@ -58,6 +53,11 @@ const authTokenKey = "GITHUB_AUTH_TOKEN"
 
 // NewController returns a new GitHubRepository Controller.
 func NewController(rcfg *rest.Config, cs kubernetes.Interface, namespace string, cfg Config) (*Controller, error) {
+	// Let's not hit rate limits.
+	// This is done here instead of an init function so we don't override the
+	// global settings for other controllers.
+	kubekit.ResyncPeriod = 30 * time.Second
+
 	rc, err := kubekit.RESTClient(rcfg, &v1alpha1.SchemeGroupVersion, v1alpha1.AddToScheme)
 	if err != nil {
 		return nil, err
@@ -117,9 +117,7 @@ func (c *Controller) run(ctx context.Context) {
 				c.syncPolicy(obj)
 			},
 			UpdateFunc: func(old, new interface{}) {
-				if ok, err := k8sutils.ShouldSync(old, new); ok && err == nil {
-					c.syncPolicy(new)
-				}
+				c.syncPolicy(new)
 			},
 			DeleteFunc: func(obj interface{}) {
 				cp := obj.(*v1alpha1.GitHubRepository).DeepCopy()

diff --git a/pkg/imagepolicy/controller.go b/pkg/imagepolicy/controller.go
@@ -9,7 +9,6 @@ import (
 	"syscall"
 
 	"github.com/manifoldco/heighliner/pkg/api/v1alpha1"
-	"github.com/manifoldco/heighliner/pkg/k8sutils"
 	"github.com/manifoldco/heighliner/pkg/registry"
 	"github.com/manifoldco/heighliner/pkg/registry/hub"
 
@@ -95,9 +94,7 @@ func (c *Controller) run(ctx context.Context) {
 				c.syncPolicy(obj)
 			},
 			UpdateFunc: func(old, new interface{}) {
-				if ok, err := k8sutils.ShouldSync(old, new); ok && err == nil {
-					c.syncPolicy(new)
-				}
+				c.syncPolicy(new)
 			},
 			DeleteFunc: func(obj interface{}) {
 				cp := obj.(*v1alpha1.ImagePolicy).DeepCopy()

diff --git a/pkg/k8sutils/status.go b/pkg/k8sutils/status.go
diff --git a/pkg/networkpolicy/controller.go b/pkg/networkpolicy/controller.go
@@ -8,7 +8,6 @@ import (
 	"syscall"
 
 	"github.com/manifoldco/heighliner/pkg/api/v1alpha1"
-	"github.com/manifoldco/heighliner/pkg/k8sutils"
 
 	"github.com/jelmersnoeck/kubekit"
 	"github.com/jelmersnoeck/kubekit/patcher"
@@ -76,15 +75,7 @@ func (c *Controller) run(ctx context.Context) {
 				c.syncNetworking(obj)
 			},
 			UpdateFunc: func(old, new interface{}) {
-				ok, err := k8sutils.ShouldSync(old, new)
-				if err != nil {
-					cp := old.(*v1alpha1.NetworkPolicy).DeepCopy()
-					log.Printf("Error syncing networkpolicy %s: %s:", cp.Name, err)
-				}
-
-				if ok {
-					c.syncNetworking(new)
-				}
+				c.syncNetworking(new)
 			},
 			DeleteFunc: func(obj interface{}) {
 				cp := obj.(*v1alpha1.NetworkPolicy).DeepCopy()

diff --git a/pkg/svc/controller.go b/pkg/svc/controller.go
@@ -77,9 +77,7 @@ func (c *Controller) run(ctx context.Context) {
 				c.patchMicroservice(obj)
 			},
 			UpdateFunc: func(old, new interface{}) {
-				if ok, err := k8sutils.ShouldSync(old, new); ok && err == nil {
-					c.patchMicroservice(new)
-				}
+				c.patchMicroservice(new)
 			},
 			DeleteFunc: func(obj interface{}) {
 				svc := obj.(*v1alpha1.Microservice).DeepCopy()
@@ -146,6 +144,7 @@ func (c *Controller) patchMicroservice(obj interface{}) error {
 
 	// new release objects, store them
 	svc.Status.Releases = deployedReleases
+
 	// need to specify types again until we resolve the mapping issue
 	svc.TypeMeta = metav1.TypeMeta{
 		Kind:       "Microservice",