Remove 'rabbitmq' from child resources suffix

- less redundant and shorter resource names
rabbitmq · Nov 6, 2020 · def80cc · def80cc
1 parent d76175b
commit def80cc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/api/v1beta1/rabbitmqcluster_types.go b/api/v1beta1/rabbitmqcluster_types.go
@@ -396,7 +396,7 @@ type RabbitmqClusterList struct {
 }
 
 func (cluster RabbitmqCluster) ChildResourceName(name string) string {
-	return strings.Join([]string{cluster.Name, "rabbitmq", name}, "-")
+	return strings.Join([]string{cluster.Name, name}, "-")
 }
 
 func init() {

diff --git a/api/v1beta1/rabbitmqcluster_types_test.go b/api/v1beta1/rabbitmqcluster_types_test.go
@@ -140,7 +140,7 @@ var _ = Describe("RabbitmqCluster", func() {
 		Describe("ChildResourceName", func() {
 			It("prefixes the passed string with the name of the RabbitmqCluster name", func() {
 				resource := generateRabbitmqClusterObject("iam")
-				Expect(resource.ChildResourceName("great")).To(Equal("iam-rabbitmq-great"))
+				Expect(resource.ChildResourceName("great")).To(Equal("iam-great"))
 			})
 		})
 

diff --git a/controllers/rabbitmqcluster_controller_test.go b/controllers/rabbitmqcluster_controller_test.go
@@ -870,7 +870,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 				"app.kubernetes.io/part-of":   "rabbitmq",
 			}))
 
-			Expect(sts.Spec.ServiceName).To(Equal("rabbitmq-sts-override-rabbitmq-headless"))
+			Expect(sts.Spec.ServiceName).To(Equal("rabbitmq-sts-override-headless"))
 			Expect(sts.Spec.Selector.MatchLabels).To(Equal(map[string]string{
 				"app.kubernetes.io/name": "rabbitmq-sts-override",
 			}))
@@ -934,7 +934,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 								{
 									Secret: &corev1.SecretProjection{
 										LocalObjectReference: corev1.LocalObjectReference{
-											Name: "rabbitmq-sts-override-rabbitmq-default-user",
+											Name: "rabbitmq-sts-override-default-user",
 										},
 										Items: []corev1.KeyToPath{
 											{
@@ -955,7 +955,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 						ConfigMap: &corev1.ConfigMapVolumeSource{
 							DefaultMode: &defaultMode,
 							LocalObjectReference: corev1.LocalObjectReference{
-								Name: "rabbitmq-sts-override-rabbitmq-server-conf",
+								Name: "rabbitmq-sts-override-server-conf",
 							},
 						},
 					},
@@ -966,7 +966,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 						ConfigMap: &corev1.ConfigMapVolumeSource{
 							DefaultMode: &defaultMode,
 							LocalObjectReference: corev1.LocalObjectReference{
-								Name: "rabbitmq-sts-override-rabbitmq-plugins-conf",
+								Name: "rabbitmq-sts-override-plugins-conf",
 							},
 						},
 					},
@@ -989,7 +989,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 					VolumeSource: corev1.VolumeSource{
 						Secret: &corev1.SecretVolumeSource{
 							DefaultMode: &defaultMode,
-							SecretName:  "rabbitmq-sts-override-rabbitmq-erlang-cookie",
+							SecretName:  "rabbitmq-sts-override-erlang-cookie",
 						},
 					},
 				},

diff --git a/internal/resource/role_binding_test.go b/internal/resource/role_binding_test.go
@@ -137,12 +137,12 @@ var _ = Describe("RoleBinding", func() {
 			expectedRoleRef := rbacv1.RoleRef{
 				APIGroup: "rbac.authorization.k8s.io",
 				Kind:     "Role",
-				Name:     "rabbit-rolebinding-rabbitmq-peer-discovery",
+				Name:     "rabbit-rolebinding-peer-discovery",
 			}
 			expectedSubjects := []rbacv1.Subject{
 				{
 					Kind: "ServiceAccount",
-					Name: "rabbit-rolebinding-rabbitmq-server",
+					Name: "rabbit-rolebinding-server",
 				},
 			}
 

diff --git a/internal/resource/statefulset_test.go b/internal/resource/statefulset_test.go
@@ -54,7 +54,7 @@ var _ = Describe("StatefulSet", func() {
 			Expect(err).NotTo(HaveOccurred())
 			sts := obj.(*appsv1.StatefulSet)
 
-			Expect(sts.Name).To(Equal("foo-rabbitmq-server"))
+			Expect(sts.Name).To(Equal("foo-server"))
 			Expect(sts.Namespace).To(Equal("foo-namespace"))
 		})
 
@@ -1480,7 +1480,7 @@ var _ = Describe("StatefulSet", func() {
 						Expect(extractContainer(statefulSet.Spec.Template.Spec.Containers, "rabbitmq").Env[2]).To(Equal(
 							corev1.EnvVar{
 								Name:  "K8S_SERVICE_NAME",
-								Value: "foo-rabbitmq-headless",
+								Value: "foo-headless",
 							}))
 						Expect(extractContainer(statefulSet.Spec.Template.Spec.Containers, "rabbitmq").Env).To(ConsistOf(
 							corev1.EnvVar{

diff --git a/system_tests/utils.go b/system_tests/utils.go
@@ -363,19 +363,19 @@ type HealthcheckResponse struct {
 }
 
 func getUsernameAndPassword(ctx context.Context, clientset *kubernetes.Clientset, namespace, instanceName string) (string, string, error) {
-	secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, fmt.Sprintf("%s-rabbitmq-default-user", instanceName), metav1.GetOptions{})
+	secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, fmt.Sprintf("%s-default-user", instanceName), metav1.GetOptions{})
 	if err != nil {
 		return "", "", err
 	}
 
 	username, ok := secret.Data["username"]
 	if !ok {
-		return "", "", fmt.Errorf("cannot find 'username' in %s-rabbitmq-default-user", instanceName)
+		return "", "", fmt.Errorf("cannot find 'username' in %s-default-user", instanceName)
 	}
 
 	password, ok := secret.Data["password"]
 	if !ok {
-		return "", "", fmt.Errorf("cannot find 'password' in %s-rabbitmq-default-user", instanceName)
+		return "", "", fmt.Errorf("cannot find 'password' in %s-default-user", instanceName)
 	}
 	return string(username), string(password), nil
 }