DO NOT MERGE: Peer discovery 4.1

config/rbac/role.yaml

@@ -18,7 +18,6 @@ rules:
   - configmaps
   - persistentvolumeclaims
   - secrets
-  - serviceaccounts
   - services
   verbs:
   - create

controllers/rabbitmqcluster_controller.go

@@ -85,7 +85,6 @@ type RabbitmqClusterReconciler struct {
 // +kubebuilder:rbac:groups=rabbitmq.com,resources=rabbitmqclusters/status,verbs=get;update
 // +kubebuilder:rbac:groups=rabbitmq.com,resources=rabbitmqclusters/finalizers,verbs=update
 // +kubebuilder:rbac:groups="",resources=events,verbs=get;create;patch
-// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=get;list;watch;create;update
 // +kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;create;update
 // +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

docs/examples/ipv6/rabbitmq.yaml

@@ -12,8 +12,6 @@ spec:
     envConfig: |
         SERVER_ADDITIONAL_ERL_ARGS="-kernel inetrc '/etc/rabbitmq/erl_inetrc'  -proto_dist inet6_tcp"
         RABBITMQ_CTL_ERL_ARGS="-proto_dist inet6_tcp"
-    additionalConfig: |
-      cluster_formation.k8s.host = kubernetes.default.svc.cluster.local
   replicas: 1
   service:
     ipFamilyPolicy: "PreferDualStack"

internal/resource/configmap.go

@@ -32,9 +32,7 @@ const (
 queue_master_locator = min-masters
 disk_free_limit.absolute = 2GB
 cluster_partition_handling = pause_minority
-cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s
-cluster_formation.k8s.host = kubernetes.default
-cluster_formation.k8s.address_type = hostname`
+cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s`
 
 	defaultTLSConf = `
 ssl_options.certfile = /etc/rabbitmq-tls/tls.crt

internal/resource/configmap_test.go

@@ -33,8 +33,6 @@ queue_master_locator                       = min-masters
 disk_free_limit.absolute                   = 2GB
 cluster_partition_handling                 = pause_minority
 cluster_formation.peer_discovery_backend   = rabbit_peer_discovery_k8s
-cluster_formation.k8s.host                 = kubernetes.default
-cluster_formation.k8s.address_type         = hostname
 cluster_formation.target_cluster_size_hint = 1
 cluster_name                               = ` + instanceName + `
 auth_mechanisms.1                          = PLAIN

internal/resource/statefulset.go

@@ -574,7 +574,6 @@ func (builder *StatefulSetBuilder) podTemplateSpec(previousPodAnnotations map[st
 			},
 			ImagePullSecrets:              builder.Instance.Spec.ImagePullSecrets,
 			TerminationGracePeriodSeconds: builder.Instance.Spec.TerminationGracePeriodSeconds,
-			ServiceAccountName:            builder.Instance.ChildResourceName(serviceAccountName),
 			AutomountServiceAccountToken:  ptr.To(true),
 			Affinity:                      builder.Instance.Spec.Affinity,
 			Tolerations:                   builder.Instance.Spec.Tolerations,

internal/resource/statefulset_test.go

@@ -1340,7 +1340,7 @@ default_pass = {{ .Data.data.password }}
 			stsBuilder := builder.StatefulSet()
 			Expect(stsBuilder.Update(statefulSet)).To(Succeed())
 
-			Expect(statefulSet.Spec.Template.Spec.ServiceAccountName).To(Equal(instance.ChildResourceName("server")))
+			Expect(statefulSet.Spec.Template.Spec.ServiceAccountName).To(BeEmpty())
 		})
 
 		It("mounts the service account in its pods", func() {