Bump controller-runtime to 0.7 and k8s.io dependencies to v.0.19.2

config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml

@@ -1239,6 +1239,15 @@ spec:
                                                   user:
                                                     type: string
                                                 type: object
+                                              seccompProfile:
+                                                properties:
+                                                  localhostProfile:
+                                                    type: string
+                                                  type:
+                                                    type: string
+                                                required:
+                                                  - type
+                                                type: object
                                               windowsOptions:
                                                 properties:
                                                   gmsaCredentialSpec:
@@ -1796,6 +1805,15 @@ spec:
                                                   user:
                                                     type: string
                                                 type: object
+                                              seccompProfile:
+                                                properties:
+                                                  localhostProfile:
+                                                    type: string
+                                                  type:
+                                                    type: string
+                                                required:
+                                                  - type
+                                                type: object
                                               windowsOptions:
                                                 properties:
                                                   gmsaCredentialSpec:
@@ -2361,6 +2379,15 @@ spec:
                                                   user:
                                                     type: string
                                                 type: object
+                                              seccompProfile:
+                                                properties:
+                                                  localhostProfile:
+                                                    type: string
+                                                  type:
+                                                    type: string
+                                                required:
+                                                  - type
+                                                type: object
                                               windowsOptions:
                                                 properties:
                                                   gmsaCredentialSpec:
@@ -2546,6 +2573,15 @@ spec:
                                             user:
                                               type: string
                                           type: object
+                                        seccompProfile:
+                                          properties:
+                                            localhostProfile:
+                                              type: string
+                                            type:
+                                              type: string
+                                          required:
+                                            - type
+                                          type: object
                                         supplementalGroups:
                                           items:
                                             format: int64
@@ -2577,6 +2613,8 @@ spec:
                                       type: string
                                     serviceAccountName:
                                       type: string
+                                    setHostnameAsFQDN:
+                                      type: boolean
                                     shareProcessNamespace:
                                       type: boolean
                                     subdomain:
@@ -2826,6 +2864,85 @@ spec:
                                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                                 x-kubernetes-int-or-string: true
                                             type: object
+                                          ephemeral:
+                                            properties:
+                                              readOnly:
+                                                type: boolean
+                                              volumeClaimTemplate:
+                                                properties:
+                                                  metadata:
+                                                    type: object
+                                                  spec:
+                                                    properties:
+                                                      accessModes:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                      dataSource:
+                                                        properties:
+                                                          apiGroup:
+                                                            type: string
+                                                          kind:
+                                                            type: string
+                                                          name:
+                                                            type: string
+                                                        required:
+                                                          - kind
+                                                          - name
+                                                        type: object
+                                                      resources:
+                                                        properties:
+                                                          limits:
+                                                            additionalProperties:
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                              x-kubernetes-int-or-string: true
+                                                            type: object
+                                                          requests:
+                                                            additionalProperties:
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                              x-kubernetes-int-or-string: true
+                                                            type: object
+                                                        type: object
+                                                      selector:
+                                                        properties:
+                                                          matchExpressions:
+                                                            items:
+                                                              properties:
+                                                                key:
+                                                                  type: string
+                                                                operator:
+                                                                  type: string
+                                                                values:
+                                                                  items:
+                                                                    type: string
+                                                                  type: array
+                                                              required:
+                                                                - key
+                                                                - operator
+                                                              type: object
+                                                            type: array
+                                                          matchLabels:
+                                                            additionalProperties:
+                                                              type: string
+                                                            type: object
+                                                        type: object
+                                                      storageClassName:
+                                                        type: string
+                                                      volumeMode:
+                                                        type: string
+                                                      volumeName:
+                                                        type: string
+                                                    type: object
+                                                required:
+                                                  - spec
+                                                type: object
+                                            type: object
                                           fc:
                                             properties:
                                               fsType:

config/rbac/leader_election_role.yaml

@@ -18,9 +18,9 @@ metadata:
     app.kubernetes.io/part-of: rabbitmq
 rules:
 - apiGroups:
-  - ""
+  - coordination.k8s.io
   resources:
-  - configmaps
+  - leases
   verbs:
   - get
   - list
@@ -29,14 +29,6 @@ rules:
   - update
   - patch
   - delete
-- apiGroups:
-  - ""
-  resources:
-  - configmaps/status
-  verbs:
-  - get
-  - update
-  - patch
 - apiGroups:
   - ""
   resources:

controllers/rabbitmqcluster_controller.go

@@ -81,8 +81,7 @@ type RabbitmqClusterReconciler struct {
 // +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=roles,verbs=get;list;watch;create;update
 // +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=rolebindings,verbs=get;list;watch;create;update
 
-func (r *RabbitmqClusterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	ctx := context.Background()
+func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := r.Log
 
 	rabbitmqCluster, err := r.getRabbitmqCluster(ctx, req.NamespacedName)
@@ -172,7 +171,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, er
 		var operationResult controllerutil.OperationResult
 		err = clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error {
 			var apiError error
-			operationResult, apiError = controllerutil.CreateOrUpdate(ctx, r, resource, func() error {
+			operationResult, apiError = controllerutil.CreateOrUpdate(ctx, r.Client, resource, func() error {
 				return builder.Update(resource)
 			})
 			return apiError
@@ -305,7 +304,7 @@ func (r *RabbitmqClusterReconciler) getRabbitmqCluster(ctx context.Context, name
 }
 
 func (r *RabbitmqClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	for _, resource := range []runtime.Object{&appsv1.StatefulSet{}, &corev1.ConfigMap{}, &corev1.Service{}} {
+	for _, resource := range []client.Object{&appsv1.StatefulSet{}, &corev1.ConfigMap{}, &corev1.Service{}} {
 		if err := mgr.GetFieldIndexer().IndexField(context.Background(), resource, ownerKey, addResourceToIndex); err != nil {
 			return err
 		}
@@ -323,7 +322,7 @@ func (r *RabbitmqClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func addResourceToIndex(rawObj runtime.Object) []string {
+func addResourceToIndex(rawObj client.Object) []string {
 	switch resourceObject := rawObj.(type) {
 	case *appsv1.StatefulSet:
 		owner := metav1.GetControllerOf(resourceObject)

controllers/reconcile_rabbitmq_configurations.go

@@ -10,7 +10,6 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	clientretry "k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -28,7 +27,7 @@ const (
 // These annotations are temporary markers used in later reconcile loops to perform some action (such as restarting the StatefulSet or executing RabbitMQ CLI commands)
 func (r *RabbitmqClusterReconciler) annotateIfNeeded(ctx context.Context, builder resource.ResourceBuilder, operationResult controllerutil.OperationResult, rmq *rabbitmqv1beta1.RabbitmqCluster) error {
 	var (
-		obj           runtime.Object
+		obj           client.Object
 		objName       string
 		annotationKey string
 	)

controllers/reconcile_tls_test.go

@@ -44,7 +44,7 @@ var _ = Describe("Reconcile TLS", func() {
 
 				sts, err := clientSet.AppsV1().StatefulSets(cluster.Namespace).Get(ctx, cluster.ChildResourceName("server"), metav1.GetOptions{})
 				Expect(err).NotTo(HaveOccurred())
-				
+
 				Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(corev1.Volume{
 					Name: "rabbitmq-tls",
 					VolumeSource: corev1.VolumeSource{

controllers/suite_test.go

@@ -13,7 +13,6 @@ package controllers_test
 import (
 	"context"
 	"path/filepath"
-	"sync"
 	"testing"
 
 	"k8s.io/client-go/util/retry"
@@ -43,22 +42,15 @@ var (
 	testEnv         *envtest.Environment
 	client          runtimeClient.Client
 	clientSet       *kubernetes.Clientset
-	stopMgr         chan struct{}
-	mgrStopped      *sync.WaitGroup
 	scheme          *runtime.Scheme
 	fakeExecutor    *fakePodExecutor
 	ctx             = context.Background()
+	cancelFunc      context.CancelFunc
 	updateWithRetry = func(cr *rabbitmqv1beta1.RabbitmqCluster, mutateFn func(r *rabbitmqv1beta1.RabbitmqCluster)) error {
 		return retry.RetryOnConflict(retry.DefaultRetry, func() error {
-			objKey, err := runtimeClient.ObjectKeyFromObject(cr)
-			if err != nil {
+			if err := client.Get(ctx, runtimeClient.ObjectKeyFromObject(cr), cr); err != nil {
 				return err
 			}
-
-			if err := client.Get(ctx, objKey, cr); err != nil {
-				return err
-			}
-
 			mutateFn(cr)
 			return client.Update(ctx, cr)
 		})
@@ -93,17 +85,16 @@ var _ = BeforeSuite(func() {
 	Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
 	Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
 
-	startManager(scheme)
+	cancelFunc = startManager(scheme)
 })
 
 var _ = AfterSuite(func() {
-	close(stopMgr)
-	mgrStopped.Wait()
+	cancelFunc()
 	By("tearing down the test environment")
 	Expect(testEnv.Stop()).To(Succeed())
 })
 
-func startManager(scheme *runtime.Scheme) {
+func startManager(scheme *runtime.Scheme) context.CancelFunc {
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{Scheme: scheme})
 	Expect(err).NotTo(HaveOccurred())
 	client = mgr.GetClient()
@@ -119,13 +110,11 @@ func startManager(scheme *runtime.Scheme) {
 	}
 	Expect(reconciler.SetupWithManager(mgr)).To(Succeed())
 
-	stopMgr = make(chan struct{})
-	mgrStopped = &sync.WaitGroup{}
-	mgrStopped.Add(1)
+	managerCtx, cancel := context.WithCancel(context.Background())
 	go func() {
-		defer mgrStopped.Done()
-		Expect(mgr.Start(stopMgr)).To(Succeed())
+		Expect(mgr.Start(managerCtx)).To(Succeed())
 	}()
+	return cancel
 }
 
 type fakePodExecutor struct {

controllers/utils.go

@@ -2,13 +2,13 @@ package controllers
 
 import (
 	"context"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/retry"
 )
@@ -17,7 +17,7 @@ func (r *RabbitmqClusterReconciler) exec(namespace, podName, containerName strin
 	return r.PodExecutor.Exec(r.Clientset, r.ClusterConfig, namespace, podName, containerName, command...)
 }
 
-func (r *RabbitmqClusterReconciler) deleteAnnotation(ctx context.Context, obj runtime.Object, annotation string) error {
+func (r *RabbitmqClusterReconciler) deleteAnnotation(ctx context.Context, obj client.Object, annotation string) error {
 	accessor, err := meta.Accessor(obj)
 	if err != nil {
 		return err
@@ -31,7 +31,7 @@ func (r *RabbitmqClusterReconciler) deleteAnnotation(ctx context.Context, obj ru
 	return r.Update(ctx, obj)
 }
 
-func (r *RabbitmqClusterReconciler) updateAnnotation(ctx context.Context, obj runtime.Object, namespace, objName, key, value string) error {
+func (r *RabbitmqClusterReconciler) updateAnnotation(ctx context.Context, obj client.Object, namespace, objName, key, value string) error {
 	return retry.OnError(
 		retry.DefaultRetry,
 		errorIsConflictOrNotFound, // StatefulSet needs time to be found after it got created

go.mod

@@ -3,32 +3,27 @@ module github.com/rabbitmq/cluster-operator
 go 1.15
 
 require (
-	github.com/Azure/go-autorest/autorest v0.9.2 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/cloudflare/cfssl v1.5.0
 	github.com/eclipse/paho.mqtt.golang v1.3.1
 	github.com/go-delve/delve v1.5.1
-	github.com/go-logr/logr v0.1.0
-	github.com/go-logr/zapr v0.1.1 // indirect
+	github.com/go-logr/logr v0.3.0
 	github.com/go-stomp/stomp v2.1.0+incompatible
 	github.com/gophercloud/gophercloud v0.5.0 // indirect
 	github.com/michaelklishin/rabbit-hole/v2 v2.6.0
 	github.com/onsi/ginkgo v1.14.2
 	github.com/onsi/gomega v1.10.4
 	github.com/pelletier/go-toml v1.8.1 // indirect
-	github.com/prometheus/client_golang v1.2.1 // indirect
 	github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
-	go.uber.org/multierr v1.2.0 // indirect
 	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
 	gopkg.in/ini.v1 v1.62.0
-	k8s.io/api v0.18.10
-	k8s.io/apimachinery v0.18.10
-	k8s.io/client-go v0.18.10
-	k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
-	sigs.k8s.io/controller-runtime v0.6.4
+	k8s.io/api v0.19.2
+	k8s.io/apimachinery v0.19.2
+	k8s.io/client-go v0.19.2
+	k8s.io/utils v0.0.0-20200912215256-4140de9c8800
+	sigs.k8s.io/controller-runtime v0.7.0
 	sigs.k8s.io/controller-tools v0.4.1
 	sigs.k8s.io/kind v0.9.0
 	sigs.k8s.io/kustomize/kustomize/v3 v3.8.8