Correct the selector label for pods/services

metal3-io · Nov 18, 2023 · 680dd8f · 680dd8f
1 parent 4c74e11
commit 680dd8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/pkg/ironic/containers.go b/pkg/ironic/containers.go
@@ -493,7 +493,7 @@ func newIronicPodTemplate(ironic *metal3api.Ironic, db *metal3api.IronicDatabase
 
  return corev1.PodTemplateSpec{
  ObjectMeta: metav1.ObjectMeta{
- Labels: map[string]string{metal3api.IronicOperatorLabel: ironicAppName},
+ Labels: map[string]string{metal3api.IronicOperatorLabel: ironicDeploymentName(ironic)},
  },
  Spec: corev1.PodSpec{
  Containers: containers,

diff --git a/pkg/ironic/database.go b/pkg/ironic/database.go
@@ -13,9 +13,8 @@ import (
 )
 
 const (
- databaseAppName = "ironic-database"
- databasePort = 3306
- databaseUser = 27
+ databasePort = 3306
+ databaseUser = 27
 )
 
 func databaseDeploymentName(db *metal3api.IronicDatabase) string {
@@ -109,7 +108,7 @@ func newDatabasePodTemplate(db *metal3api.IronicDatabase) corev1.PodTemplateSpec
 
  return corev1.PodTemplateSpec{
  ObjectMeta: metav1.ObjectMeta{
- Labels: map[string]string{metal3api.IronicOperatorLabel: databaseAppName},
+ Labels: map[string]string{metal3api.IronicOperatorLabel: databaseDeploymentName(db)},
  },
  Spec: corev1.PodSpec{
  Containers: containers,
@@ -125,7 +124,7 @@ func ensureDatabaseDeployment(cctx ControllerContext, db *metal3api.IronicDataba
  _, err := controllerutil.CreateOrUpdate(cctx.Context, cctx.Client, deploy, func() error {
  if deploy.ObjectMeta.CreationTimestamp.IsZero() {
  cctx.Logger.Info("creating a new deployment")
- matchLabels := map[string]string{metal3api.IronicOperatorLabel: databaseAppName}
+ matchLabels := map[string]string{metal3api.IronicOperatorLabel: databaseDeploymentName(db)}
  deploy.Spec.Selector = &metav1.LabelSelector{
  MatchLabels: matchLabels,
  }
@@ -149,9 +148,9 @@ func ensureDatabaseService(cctx ControllerContext, db *metal3api.IronicDatabase)
  cctx.Logger.Info("creating a new service")
  service.ObjectMeta.Labels = make(map[string]string)
  }
- service.ObjectMeta.Labels[metal3api.IronicOperatorLabel] = databaseAppName
+ service.ObjectMeta.Labels[metal3api.IronicOperatorLabel] = databaseDeploymentName(db)
 
- service.Spec.Selector = map[string]string{metal3api.IronicOperatorLabel: databaseAppName}
+ service.Spec.Selector = map[string]string{metal3api.IronicOperatorLabel: databaseDeploymentName(db)}
  service.Spec.Ports = []corev1.ServicePort{
  {
  Protocol: corev1.ProtocolTCP,

diff --git a/pkg/ironic/ironic.go b/pkg/ironic/ironic.go
@@ -16,10 +16,6 @@ import (
  metal3api "github.com/metal3-io/ironic-operator/api/v1alpha1"
 )
 
-const (
- ironicAppName = "ironic-service"
-)
-
 func ironicDeploymentName(ironic *metal3api.Ironic) string {
  return fmt.Sprintf("%s-service", ironic.Name)
 }
@@ -39,7 +35,7 @@ func ensureIronicDaemonSet(cctx ControllerContext, ironic *metal3api.Ironic, db
  _, err = controllerutil.CreateOrUpdate(cctx.Context, cctx.Client, deploy, func() error {
  if deploy.ObjectMeta.CreationTimestamp.IsZero() {
  cctx.Logger.Info("creating a new ironic daemon set")
- matchLabels := map[string]string{metal3api.IronicOperatorLabel: ironicAppName}
+ matchLabels := map[string]string{metal3api.IronicOperatorLabel: ironicDeploymentName(ironic)}
  deploy.Spec.Selector = &metav1.LabelSelector{
  MatchLabels: matchLabels,
  }
@@ -68,7 +64,7 @@ func ensureIronicDeployment(cctx ControllerContext, ironic *metal3api.Ironic, db
  _, err = controllerutil.CreateOrUpdate(cctx.Context, cctx.Client, deploy, func() error {
  if deploy.ObjectMeta.CreationTimestamp.IsZero() {
  cctx.Logger.Info("creating a new ironic deployment")
- matchLabels := map[string]string{metal3api.IronicOperatorLabel: ironicAppName}
+ matchLabels := map[string]string{metal3api.IronicOperatorLabel: ironicDeploymentName(ironic)}
  deploy.Spec.Selector = &metav1.LabelSelector{
  MatchLabels: matchLabels,
  }
@@ -100,9 +96,9 @@ func ensureIronicService(cctx ControllerContext, ironic *metal3api.Ironic) (meta
  cctx.Logger.Info("creating a new ironic service")
  service.ObjectMeta.Labels = make(map[string]string)
  }
- service.ObjectMeta.Labels[metal3api.IronicOperatorLabel] = databaseAppName
+ service.ObjectMeta.Labels[metal3api.IronicOperatorLabel] = ironicDeploymentName(ironic)
 
- service.Spec.Selector = map[string]string{metal3api.IronicOperatorLabel: ironicAppName}
+ service.Spec.Selector = map[string]string{metal3api.IronicOperatorLabel: ironicDeploymentName(ironic)}
  service.Spec.Ports = []corev1.ServicePort{
  {
  Protocol: corev1.ProtocolTCP,