Update submodule and replace some deprecated interface usages

Signed-off-by: Jake Utley <[email protected]>
crossplane-contrib · Jan 26, 2023 · 00038ec · 00038ec
1 parent 220a859
commit 00038ec
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/build b/build
diff --git a/cmd/provider/main.go b/cmd/provider/main.go
@@ -25,7 +25,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
-	"github.com/crossplane/crossplane-runtime/pkg/ratelimiter"
 
 	"github.com/crossplane-contrib/provider-kafka/apis"
 	"github.com/crossplane-contrib/provider-kafka/internal/controller"
@@ -61,8 +60,7 @@ func main() {
 	})
 	kingpin.FatalIfError(err, "Cannot create controller manager")
 
-	rl := ratelimiter.NewDefaultProviderRateLimiter(ratelimiter.DefaultProviderRPS)
 	kingpin.FatalIfError(apis.AddToScheme(mgr.GetScheme()), "Cannot add Kafka APIs to scheme")
-	kingpin.FatalIfError(controller.Setup(mgr, log, rl), "Cannot setup Kafka controllers")
+	kingpin.FatalIfError(controller.Setup(mgr, log), "Cannot setup Kafka controllers")
 	kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager")
 }
diff --git a/go.mod b/go.mod
@@ -14,7 +14,6 @@ require (
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1
-	k8s.io/client-go v0.26.1
 	sigs.k8s.io/controller-runtime v0.14.1
 	sigs.k8s.io/controller-tools v0.11.1
 )
@@ -83,6 +82,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/client-go v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
 	k8s.io/klog/v2 v2.80.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect

diff --git a/internal/clients/kafka/topic/topic.go b/internal/clients/kafka/topic/topic.go
@@ -30,8 +30,10 @@ const (
 	errNoDeleteResponseForTopic   = "no delete response for topic"
 	errCannotDeleteTopic          = "cannot delete topic"
 	errCannotGetTopic             = "cannot get topic"
-	ErrTopicDoesNotExist          = "topic does not exist"
 	errCannotUpdateTopicConfigs   = "cannot update topic configs"
+
+	// ErrTopicDoesNotExist indicates that the topic of a given name doesn't exist in the external Kafka cluster
+	ErrTopicDoesNotExist = "topic does not exist"
 )
 
 // Get gets the topic from Kafka side and returns a Topic object.

diff --git a/internal/controller/acl/acl.go b/internal/controller/acl/acl.go
@@ -31,7 +31,6 @@ import (
 
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/util/workqueue"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -57,11 +56,11 @@ const (
 )
 
 // Setup adds a controller that reconciles AccessControlList managed resources.
-func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter) error {
+func Setup(mgr ctrl.Manager, l logging.Logger) error {
 	name := managed.ControllerName(v1alpha1.AccessControlListGroupKind)
 
 	o := controller.Options{
-		RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl),
+		RateLimiter: ratelimiter.NewController(),
 	}
 
 	r := managed.NewReconciler(mgr,

diff --git a/internal/controller/config/config.go b/internal/controller/config/config.go
@@ -17,7 +17,6 @@ limitations under the License.
 package config
 
 import (
-	"k8s.io/client-go/util/workqueue"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -33,11 +32,11 @@ import (
 
 // Setup adds a controller that reconciles ProviderConfigs by accounting for
 // their current usage.
-func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter) error {
+func Setup(mgr ctrl.Manager, l logging.Logger) error {
 	name := providerconfig.ControllerName(v1alpha1.ProviderConfigGroupKind)
 
 	o := controller.Options{
-		RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl),
+		RateLimiter: ratelimiter.NewController(),
 	}
 
 	of := resource.ProviderConfigKinds{

diff --git a/internal/controller/kafka.go b/internal/controller/kafka.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controller
 
 import (
-	"k8s.io/client-go/util/workqueue"
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
@@ -29,13 +28,13 @@ import (
 
 // Setup creates all Template controllers with the supplied logger and adds them to
 // the supplied manager.
-func Setup(mgr ctrl.Manager, l logging.Logger, wl workqueue.RateLimiter) error {
-	for _, setup := range []func(ctrl.Manager, logging.Logger, workqueue.RateLimiter) error{
+func Setup(mgr ctrl.Manager, l logging.Logger) error {
+	for _, setup := range []func(ctrl.Manager, logging.Logger) error{
 		config.Setup,
 		topic.Setup,
 		acl.Setup,
 	} {
-		if err := setup(mgr, l, wl); err != nil {
+		if err := setup(mgr, l); err != nil {
 			return err
 		}
 	}

diff --git a/internal/controller/topic/topic.go b/internal/controller/topic/topic.go
@@ -30,7 +30,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/twmb/franz-go/pkg/kadm"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/util/workqueue"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -52,11 +51,11 @@ const (
 )
 
 // Setup adds a controller that reconciles Topic managed resources.
-func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter) error {
+func Setup(mgr ctrl.Manager, l logging.Logger) error {
 	name := managed.ControllerName(v1alpha1.TopicGroupKind)
 
 	o := controller.Options{
-		RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl),
+		RateLimiter: ratelimiter.NewController(),
 	}
 
 	r := managed.NewReconciler(mgr,
+35 −0		makelib/controlplane.mk
+17 −2		makelib/docs.mk
+1 −7		makelib/golang.mk
+14 −1		makelib/k8s_tools.mk
+45 −0		makelib/local.xpkg.mk