Rename configmaps const names to be more explicit

rabbitmq · Oct 20, 2020 · 7ae8c5b · 7ae8c5b
1 parent 63ea25c
commit 7ae8c5b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/controllers/rabbitmqcluster_controller.go b/controllers/rabbitmqcluster_controller.go
@@ -346,7 +346,7 @@ func (r *RabbitmqClusterReconciler) runPostDeployStepsIfNeeded(ctx context.Conte
 	}
 
 	// Retrieve the plugins config map, if it exists.
-	pluginsConfig, err := r.configMap(ctx, rmq, rmq.ChildResourceName(resource.PluginsConfig))
+	pluginsConfig, err := r.configMap(ctx, rmq, rmq.ChildResourceName(resource.PluginsConfigName))
 	if client.IgnoreNotFound(err) != nil {
 		return 0, err
 	}
@@ -431,7 +431,7 @@ func (r *RabbitmqClusterReconciler) runSetPluginsCommand(ctx context.Context, rm
 // it compares annotation "rabbitmq.com/serverConfUpdatedAt" from server-conf configMap and annotation "rabbitmq.com/lastRestartAt" from sts
 // to determine whether to restart sts
 func (r *RabbitmqClusterReconciler) restartStatefulSetIfNeeded(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster) (time.Duration, error) {
-	serverConf, err := r.configMap(ctx, rmq, rmq.ChildResourceName(resource.ServerConfigMap))
+	serverConf, err := r.configMap(ctx, rmq, rmq.ChildResourceName(resource.ServerConfigMapName))
 	if err != nil {
 		// requeue request after 10s if unable to find server-conf configmap, else return the error
 		return 10 * time.Second, client.IgnoreNotFound(err)
@@ -506,10 +506,10 @@ func (r *RabbitmqClusterReconciler) annotateConfigMapIfUpdated(ctx context.Conte
 	var configMap, annotationKey string
 	switch builder.(type) {
 	case *resource.RabbitmqPluginsConfigMapBuilder:
-		configMap = rmq.ChildResourceName(resource.PluginsConfig)
+		configMap = rmq.ChildResourceName(resource.PluginsConfigName)
 		annotationKey = pluginsUpdateAnnotation
 	case *resource.ServerConfigMapBuilder:
-		configMap = rmq.ChildResourceName(resource.ServerConfigMap)
+		configMap = rmq.ChildResourceName(resource.ServerConfigMapName)
 		annotationKey = serverConfAnnotation
 	default:
 		return nil

diff --git a/internal/resource/configmap.go b/internal/resource/configmap.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	ServerConfigMap     = "server-conf"
+	ServerConfigMapName = "server-conf"
 	defaultRabbitmqConf = `
 cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s
 cluster_formation.k8s.host = kubernetes.default
@@ -112,7 +112,7 @@ func (builder *ServerConfigMapBuilder) Update(object runtime.Object) error {
 func (builder *ServerConfigMapBuilder) Build() (runtime.Object, error) {
 	return &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      builder.Instance.ChildResourceName(ServerConfigMap),
+			Name:      builder.Instance.ChildResourceName(ServerConfigMapName),
 			Namespace: builder.Instance.Namespace,
 		},
 	}, nil

diff --git a/internal/resource/rabbitmq_plugins.go b/internal/resource/rabbitmq_plugins.go
@@ -18,7 +18,7 @@ var requiredPlugins = []string{
 	"rabbitmq_management",
 }
 
-const PluginsConfig = "plugins-conf"
+const PluginsConfigName = "plugins-conf"
 
 type RabbitmqPlugins struct {
 	requiredPlugins   []string
@@ -86,7 +86,7 @@ func (builder *RabbitmqPluginsConfigMapBuilder) Update(object runtime.Object) er
 func (builder *RabbitmqPluginsConfigMapBuilder) Build() (runtime.Object, error) {
 	return &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      builder.Instance.ChildResourceName(PluginsConfig),
+			Name:      builder.Instance.ChildResourceName(PluginsConfigName),
 			Namespace: builder.Instance.Namespace,
 		},
 		Data: map[string]string{

diff --git a/internal/resource/statefulset.go b/internal/resource/statefulset.go
@@ -259,7 +259,7 @@ func (builder *StatefulSetBuilder) podTemplateSpec(annotations, labels map[strin
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
-						Name: builder.Instance.ChildResourceName(ServerConfigMap),
+						Name: builder.Instance.ChildResourceName(ServerConfigMapName),
 					},
 				},
 			},
@@ -269,7 +269,7 @@ func (builder *StatefulSetBuilder) podTemplateSpec(annotations, labels map[strin
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
-						Name: builder.Instance.ChildResourceName(PluginsConfig),
+						Name: builder.Instance.ChildResourceName(PluginsConfigName),
 					},
 				},
 			},