From 64bc46a5abc7c0f53ed5eaa37370eb93b325b5c4 Mon Sep 17 00:00:00 2001 From: David Ansari Date: Mon, 15 Aug 2022 08:26:34 +0000 Subject: [PATCH] Remove deprecated cluster_formation configuration Since we bumped the minimum supported RabbitMQ version to v3.9.0 in https://github.com/rabbitmq/cluster-operator/pull/1110, we can delete the deprecated `cluster_formation.randomized_startup_delay_range` configurations. See https://github.com/rabbitmq/rabbitmq-server/pull/3075. Prior to this commit, the RabbitMQ logs contained the following warning: ``` 2022-08-15 08:18:03.870480+00:00 [warn] <0.130.0> cluster_formation.randomized_startup_delay_range.min and cluster_formation.randomized_startup_delay_range.max are deprecated ``` --- internal/resource/configmap.go | 4 +--- internal/resource/configmap_test.go | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/resource/configmap.go b/internal/resource/configmap.go index d13f80ef0..8f4f636de 100644 --- a/internal/resource/configmap.go +++ b/internal/resource/configmap.go @@ -32,9 +32,7 @@ cluster_formation.k8s.host = kubernetes.default cluster_formation.k8s.address_type = hostname cluster_partition_handling = pause_minority queue_master_locator = min-masters -disk_free_limit.absolute = 2GB -cluster_formation.randomized_startup_delay_range.min = 0 -cluster_formation.randomized_startup_delay_range.max = 60` +disk_free_limit.absolute = 2GB` defaultTLSConf = ` ssl_options.certfile = /etc/rabbitmq-tls/tls.crt diff --git a/internal/resource/configmap_test.go b/internal/resource/configmap_test.go index 4416023d1..6b1164e1e 100644 --- a/internal/resource/configmap_test.go +++ b/internal/resource/configmap_test.go @@ -33,8 +33,6 @@ cluster_formation.k8s.address_type = hostname cluster_partition_handling = pause_minority queue_master_locator = min-masters disk_free_limit.absolute = 2GB -cluster_formation.randomized_startup_delay_range.min = 0 -cluster_formation.randomized_startup_delay_range.max = 60 cluster_name = ` + instanceName) }