Change resource naming scheme (#123)

Use the `Endpoints` name as the name for the dected `BMC`. `Servers`
will be prefixed with the `Endpoint` name followed by a `-system-idx`.

E.g.: `Endpoint` `compute-10` -> `BMC` `compute-10` -> `Server`
`compute-10-system-0`

Author: afritzler

api/v1alpha1/zz_generated.deepcopy.go

@@ -4,8 +4,6 @@
 package controller
 
 import (
-	"fmt"
-
 	metalv1alpha1 "github.com/ironcore-dev/metal-operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -37,7 +35,7 @@ var _ = Describe("BMC Controller", func() {
 		By("Ensuring that the BMC will be removed")
 		bmc := &metalv1alpha1.BMC{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: fmt.Sprintf("bmc-%s", endpoint.Name),
+				Name: endpoint.Name,
 			},
 		}
 		DeferCleanup(k8sClient.Delete, bmc)
@@ -63,7 +61,7 @@ var _ = Describe("BMC Controller", func() {
 		By("Ensuring that the BMC resource has been created for an endpoint")
 		bmc := &metalv1alpha1.BMC{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: fmt.Sprintf("bmc-%s", endpoint.Name),
+				Name: endpoint.Name,
 			},
 		}
 		Eventually(Object(bmc)).Should(SatisfyAll(
@@ -99,7 +97,7 @@ var _ = Describe("BMC Controller", func() {
 				BlockOwnerDeletion: ptr.To(true),
 			})),
 			HaveField("Spec.UUID", "38947555-7742-3448-3784-823347823834"),
-			HaveField("Spec.BMCRef.Name", GetBMCNameFromEndpoint(endpoint)),
+			HaveField("Spec.BMCRef.Name", endpoint.Name),
 		))
 	})
 })

internal/controller/bmc_controller_test.go

@@ -114,13 +114,5 @@ func GetBMCCredentialsFromSecret(secret *metalv1alpha1.BMCSecret) (string, strin
 }
 
 func GetServerNameFromBMCandIndex(index int, bmc *metalv1alpha1.BMC) string {
-	return fmt.Sprintf("compute-%d-%s", index, bmc.Name)
-}
-
-func GetBMCNameFromEndpoint(endpoint *metalv1alpha1.Endpoint) string {
-	return fmt.Sprintf("bmc-%s", endpoint.Name)
-}
-
-func GetBMCSecretNameFromEndpoint(endpoint *metalv1alpha1.Endpoint) string {
-	return fmt.Sprintf("bmc-%s", endpoint.Name)
+	return fmt.Sprintf("%s-%s-%d", bmc.Name, "system", index)
 }

internal/controller/bmcutils.go

@@ -146,8 +146,7 @@ func (r *EndpointReconciler) applyBMC(ctx context.Context, log logr.Logger, endp
 			Kind:       "BMC",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			// TODO: make name prefix configurable
-			Name: fmt.Sprintf("bmc-%s", endpoint.Name),
+			Name: endpoint.Name,
 		},
 		Spec: metalv1alpha1.BMCSpec{
 			EndpointRef: corev1.LocalObjectReference{
@@ -187,7 +186,7 @@ func (r *EndpointReconciler) applyBMCSecret(ctx context.Context, log logr.Logger
 			Kind:       "BMCSecret",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: GetBMCSecretNameFromEndpoint(endpoint),
+			Name: endpoint.Name,
 		},
 		Data: map[string][]byte{
 			"username": []byte(base64.StdEncoding.EncodeToString([]byte(m.DefaultCredentials[0].Username))),

internal/controller/endpoint_controller.go

@@ -35,7 +35,7 @@ var _ = Describe("Endpoints Controller", func() {
 		By("Ensuring that the BMC secret has been created")
 		bmcSecret := &metalv1alpha1.BMCSecret{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: GetBMCSecretNameFromEndpoint(endpoint),
+				Name: endpoint.Name,
 			},
 		}
 		Eventually(Object(bmcSecret)).Should(SatisfyAll(
@@ -56,7 +56,7 @@ var _ = Describe("Endpoints Controller", func() {
 		By("By ensuring that the BMC object has been created")
 		bmc := &metalv1alpha1.BMC{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: GetBMCNameFromEndpoint(endpoint),
+				Name: endpoint.Name,
 			},
 		}
 		Eventually(Object(bmc)).Should(SatisfyAll(

internal/controller/endpoint_controller_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Server Controller", func() {
 		By("Ensuring that the BMC resource has been created for an endpoint")
 		bmc = &metalv1alpha1.BMC{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: fmt.Sprintf("bmc-%s", endpoint.Name),
+				Name: endpoint.Name,
 			},
 		}
 		Eventually(Get(bmc)).Should(Succeed())
@@ -63,7 +63,7 @@ var _ = Describe("Server Controller", func() {
 		By("Ensuring that the Server resource has been created")
 		server := &metalv1alpha1.Server{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: fmt.Sprintf("compute-0-%s", bmc.Name),
+				Name: fmt.Sprintf("%s-system-0", bmc.Name),
 			},
 		}
 		Eventually(Object(server)).Should(SatisfyAll(