Correct admin secret volumes

rabbitmq-admin is the temporary volume for the initContainer, and
contains the actual secret data.

rabbitmq-confd is the empty volume that is populated by the
initContainer from rabbitmq-admin.

Author: coro

Diff for: controllers/rabbitmqcluster_controller_test.go

@@ -1206,6 +1206,21 @@ var _ = Describe("RabbitmqclusterController", func() {
 
 			Expect(sts.Spec.Template.Spec.HostNetwork).To(BeFalse())
 			Expect(sts.Spec.Template.Spec.Volumes).To(ConsistOf(
+				corev1.Volume{
+					Name: "rabbitmq-admin",
+					VolumeSource: corev1.VolumeSource{
+						Secret: &corev1.SecretVolumeSource{
+							DefaultMode: &defaultMode,
+							SecretName:  "rabbitmq-sts-override-rabbitmq-admin",
+							Items: []corev1.KeyToPath{
+								{
+									Key:  "default_user.conf",
+									Path: "default_user.conf",
+								},
+							},
+						},
+					},
+				},
 				corev1.Volume{
 					Name: "additional-config",
 					VolumeSource: corev1.VolumeSource{
@@ -1220,16 +1235,7 @@ var _ = Describe("RabbitmqclusterController", func() {
 				corev1.Volume{
 					Name: "rabbitmq-confd",
 					VolumeSource: corev1.VolumeSource{
-						Secret: &corev1.SecretVolumeSource{
-							DefaultMode: &defaultMode,
-							SecretName:  "rabbitmq-sts-override-rabbitmq-admin",
-							Items: []corev1.KeyToPath{
-								{
-									Key:  "default_user.conf",
-									Path: "default_user.conf",
-								},
-							},
-						},
+						EmptyDir: &corev1.EmptyDirVolumeSource{},
 					},
 				},
 				corev1.Volume{

Diff for: internal/resource/statefulset.go

@@ -258,6 +258,20 @@ func (builder *StatefulSetBuilder) podTemplateSpec(annotations, labels map[strin
 	terminationGracePeriod := defaultGracePeriodTimeoutSeconds
 
 	volumes := []corev1.Volume{
+		{
+			Name: "rabbitmq-admin",
+			VolumeSource: corev1.VolumeSource{
+				Secret: &corev1.SecretVolumeSource{
+					SecretName: builder.Instance.ChildResourceName(AdminSecretName),
+					Items: []corev1.KeyToPath{
+						{
+							Key:  "default_user.conf",
+							Path: "default_user.conf",
+						},
+					},
+				},
+			},
+		},
 		{
 			Name: "server-conf",
 			VolumeSource: corev1.VolumeSource{
@@ -287,15 +301,7 @@ func (builder *StatefulSetBuilder) podTemplateSpec(annotations, labels map[strin
 		{
 			Name: "rabbitmq-confd",
 			VolumeSource: corev1.VolumeSource{
-				Secret: &corev1.SecretVolumeSource{
-					SecretName: builder.Instance.ChildResourceName(AdminSecretName),
-					Items: []corev1.KeyToPath{
-						{
-							Key:  "default_user.conf",
-							Path: "default_user.conf",
-						},
-					},
-				},
+				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
 		},
 		{

Diff for: internal/resource/statefulset_test.go

@@ -815,6 +815,20 @@ var _ = Describe("StatefulSet", func() {
 			Expect(stsBuilder.Update(statefulSet)).To(Succeed())
 
 			Expect(statefulSet.Spec.Template.Spec.Volumes).To(ConsistOf(
+				corev1.Volume{
+					Name: "rabbitmq-admin",
+					VolumeSource: corev1.VolumeSource{
+						Secret: &corev1.SecretVolumeSource{
+							SecretName: instance.ChildResourceName("admin"),
+							Items: []corev1.KeyToPath{
+								{
+									Key:  "default_user.conf",
+									Path: "default_user.conf",
+								},
+							},
+						},
+					},
+				},
 				corev1.Volume{
 					Name: "server-conf",
 					VolumeSource: corev1.VolumeSource{
@@ -844,15 +858,7 @@ var _ = Describe("StatefulSet", func() {
 				corev1.Volume{
 					Name: "rabbitmq-confd",
 					VolumeSource: corev1.VolumeSource{
-						Secret: &corev1.SecretVolumeSource{
-							SecretName: instance.ChildResourceName("admin"),
-							Items: []corev1.KeyToPath{
-								{
-									Key:  "default_user.conf",
-									Path: "default_user.conf",
-								},
-							},
-						},
+						EmptyDir: &corev1.EmptyDirVolumeSource{},
 					},
 				},
 				corev1.Volume{