Merge branch 'main' into add-bucket-iam-role-policy-example

Author: sata

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.10.0
+
+**Release date:** 2021-03-26
+
+This is the tenth MINOR prerelease.
+
+This prerelease comes with a breaking change to the leader election ID
+from `305740c0.fluxcd.io` to `source-controller-leader-election`
+to be more descriptive. This change should not have an impact on most
+installations, as the default replica count is `1`. If you are running
+a setup with multiple replicas, it is however advised to scale down
+before  upgrading.
+
+The suspended status of resources is now recorded to a
+`gotk_suspend_status` Prometheus gauge metric.
+
+Improvements:
+* Record suspend metrics in controllers
+  [#311](https://github.com/fluxcd/source-controller/pull/311)
+* Set leader election deadline to 30s
+  [#318](https://github.com/fluxcd/notification-controller/pull/318)
+* Change leader election ID to be more descriptive
+  [#319](https://github.com/fluxcd/notification-controller/pull/319)
+
 ## 0.9.1
 
 **Release date:** 2021-03-15

config/manager/kustomization.yaml

@@ -6,4 +6,4 @@ resources:
 images:
 - name: fluxcd/source-controller
   newName: fluxcd/source-controller
-  newTag: v0.9.1
+  newTag: v0.10.0

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/fluxcd/pkg/ssh v0.0.5
 	github.com/fluxcd/pkg/untar v0.0.5
 	github.com/fluxcd/pkg/version v0.0.1
-	github.com/fluxcd/source-controller/api v0.9.1
+	github.com/fluxcd/source-controller/api v0.10.0
 	github.com/go-git/go-billy/v5 v5.0.0
 	github.com/go-git/go-git/v5 v5.2.0
 	github.com/go-logr/logr v0.3.0

main.go

@@ -47,6 +47,8 @@ import (
 	// +kubebuilder:scaffold:imports
 )
 
+const controllerName = "source-controller"
+
 var (
 	scheme   = runtime.NewScheme()
 	setupLog = ctrl.Log.WithName("setup")
@@ -103,7 +105,7 @@ func main() {
 
 	var eventRecorder *events.Recorder
 	if eventsAddr != "" {
-		if er, err := events.NewRecorder(eventsAddr, "source-controller"); err != nil {
+		if er, err := events.NewRecorder(eventsAddr, controllerName); err != nil {
 			setupLog.Error(err, "unable to create event recorder")
 			os.Exit(1)
 		} else {
@@ -130,7 +132,7 @@ func main() {
 		LeaseDuration:                 &leaderElectionOptions.LeaseDuration,
 		RenewDeadline:                 &leaderElectionOptions.RenewDeadline,
 		RetryPeriod:                   &leaderElectionOptions.RetryPeriod,
-		LeaderElectionID:              "305740c0.fluxcd.io",
+		LeaderElectionID:              fmt.Sprintf("%s-leader-election", controllerName),
 		Namespace:                     watchNamespace,
 		Logger:                        ctrl.Log,
 	})
@@ -151,7 +153,7 @@ func main() {
 		Client:                mgr.GetClient(),
 		Scheme:                mgr.GetScheme(),
 		Storage:               storage,
-		EventRecorder:         mgr.GetEventRecorderFor("source-controller"),
+		EventRecorder:         mgr.GetEventRecorderFor(controllerName),
 		ExternalEventRecorder: eventRecorder,
 		MetricsRecorder:       metricsRecorder,
 	}).SetupWithManagerAndOptions(mgr, controllers.GitRepositoryReconcilerOptions{
@@ -165,7 +167,7 @@ func main() {
 		Scheme:                mgr.GetScheme(),
 		Storage:               storage,
 		Getters:               getters,
-		EventRecorder:         mgr.GetEventRecorderFor("source-controller"),
+		EventRecorder:         mgr.GetEventRecorderFor(controllerName),
 		ExternalEventRecorder: eventRecorder,
 		MetricsRecorder:       metricsRecorder,
 	}).SetupWithManagerAndOptions(mgr, controllers.HelmRepositoryReconcilerOptions{
@@ -179,7 +181,7 @@ func main() {
 		Scheme:                mgr.GetScheme(),
 		Storage:               storage,
 		Getters:               getters,
-		EventRecorder:         mgr.GetEventRecorderFor("source-controller"),
+		EventRecorder:         mgr.GetEventRecorderFor(controllerName),
 		ExternalEventRecorder: eventRecorder,
 		MetricsRecorder:       metricsRecorder,
 	}).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{
@@ -192,7 +194,7 @@ func main() {
 		Client:                mgr.GetClient(),
 		Scheme:                mgr.GetScheme(),
 		Storage:               storage,
-		EventRecorder:         mgr.GetEventRecorderFor("source-controller"),
+		EventRecorder:         mgr.GetEventRecorderFor(controllerName),
 		ExternalEventRecorder: eventRecorder,
 		MetricsRecorder:       metricsRecorder,
 	}).SetupWithManagerAndOptions(mgr, controllers.BucketReconcilerOptions{