Merge pull request #192 from fluxcd/upgrade-runtime-v0.6.1

fluxcd · Jan 14, 2021 · 8010dff · 8010dff
2 parents 38b3dff + 9b139cd
commit 8010dff
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/api/go.mod b/api/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/fluxcd/pkg/apis/meta v0.5.0
-	github.com/fluxcd/pkg/runtime v0.6.0
+	github.com/fluxcd/pkg/runtime v0.6.2
 	k8s.io/api v0.19.4
 	k8s.io/apiextensions-apiserver v0.19.4
 	k8s.io/apimachinery v0.19.4

diff --git a/api/go.sum b/api/go.sum
@@ -86,8 +86,8 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fluxcd/pkg/apis/meta v0.5.0 h1:FaU++mQY0g4sVVl+hG+vk0CXBLbb4EVfRuzs3IjLXvo=
 github.com/fluxcd/pkg/apis/meta v0.5.0/go.mod h1:aEUuZIawboAAFLlYz/juVJ7KNmlWbBtJFYkOWWmGUR4=
-github.com/fluxcd/pkg/runtime v0.6.0 h1:m76ohcnLEcpMMqf+YyADWVYG9pvuKeCUoi3CTx+gIXw=
-github.com/fluxcd/pkg/runtime v0.6.0/go.mod h1:RuqYOYCvBJwo4rg83d28WOt2vfSaemuZCVpUagAjWQc=
+github.com/fluxcd/pkg/runtime v0.6.2 h1:sWnSv6AhMY30fexRQ37lv2Q9Rvdu05zbiqMSldw+MjQ=
+github.com/fluxcd/pkg/runtime v0.6.2/go.mod h1:RuqYOYCvBJwo4rg83d28WOt2vfSaemuZCVpUagAjWQc=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -5,6 +5,6 @@ resources:
 - ../crd
 - ../rbac
 - ../manager
-- github.com/fluxcd/source-controller/config//crd?ref=v0.6.0
-- github.com/fluxcd/source-controller/config//manager?ref=v0.6.0
+- github.com/fluxcd/source-controller/config//crd?ref=v0.6.1
+- github.com/fluxcd/source-controller/config//manager?ref=v0.6.1
 - namespace.yaml
diff --git a/controllers/helmrelease_controller.go b/controllers/helmrelease_controller.go
@@ -94,7 +94,7 @@ func (r *HelmReleaseReconciler) SetupWithManager(mgr ctrl.Manager, opts HelmRele
 	r.requeueDependency = opts.DependencyRequeueInterval
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&v2.HelmRelease{}, builder.WithPredicates(
-			predicate.Or(predicate.GenerationChangedPredicate{}, predicates.ReconcilateAtChangedPredicate{}),
+			predicate.Or(predicate.GenerationChangedPredicate{}, predicates.ReconcileRequestedPredicate{}),
 		)).
 		Watches(
 			&source.Kind{Type: &sourcev1.HelmChart{}},

diff --git a/go.mod b/go.mod
@@ -7,8 +7,8 @@ replace github.com/fluxcd/helm-controller/api => ./api
 require (
 	github.com/fluxcd/helm-controller/api v0.5.0
 	github.com/fluxcd/pkg/apis/meta v0.5.0
-	github.com/fluxcd/pkg/runtime v0.6.0
-	github.com/fluxcd/source-controller/api v0.6.0
+	github.com/fluxcd/pkg/runtime v0.6.2
+	github.com/fluxcd/source-controller/api v0.6.1
 	github.com/go-logr/logr v0.3.0
 	github.com/onsi/ginkgo v1.14.1
 	github.com/onsi/gomega v1.10.2

diff --git a/go.sum b/go.sum
@@ -207,10 +207,10 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fluxcd/pkg/apis/meta v0.5.0 h1:FaU++mQY0g4sVVl+hG+vk0CXBLbb4EVfRuzs3IjLXvo=
 github.com/fluxcd/pkg/apis/meta v0.5.0/go.mod h1:aEUuZIawboAAFLlYz/juVJ7KNmlWbBtJFYkOWWmGUR4=
-github.com/fluxcd/pkg/runtime v0.6.0 h1:m76ohcnLEcpMMqf+YyADWVYG9pvuKeCUoi3CTx+gIXw=
-github.com/fluxcd/pkg/runtime v0.6.0/go.mod h1:RuqYOYCvBJwo4rg83d28WOt2vfSaemuZCVpUagAjWQc=
-github.com/fluxcd/source-controller/api v0.6.0 h1:apwDhN6upiCVhivCAGaP1I3elbYc74vamuhNT0OBIr0=
-github.com/fluxcd/source-controller/api v0.6.0/go.mod h1:5eEXvQGVAuxJmCm/ooewsNTQR7Y9L75/cRP1WF74j5s=
+github.com/fluxcd/pkg/runtime v0.6.2 h1:sWnSv6AhMY30fexRQ37lv2Q9Rvdu05zbiqMSldw+MjQ=
+github.com/fluxcd/pkg/runtime v0.6.2/go.mod h1:RuqYOYCvBJwo4rg83d28WOt2vfSaemuZCVpUagAjWQc=
+github.com/fluxcd/source-controller/api v0.6.1 h1:sKrq2bS6rANk2BgMNOmS+shBNkzbtIl1/v3BXkVVWag=
+github.com/fluxcd/source-controller/api v0.6.1/go.mod h1:5eEXvQGVAuxJmCm/ooewsNTQR7Y9L75/cRP1WF74j5s=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=