Improve consistency

Author: Alphadelta14

src/orchestratord/src/controller/balancer.rs

@@ -193,7 +193,6 @@ impl Context {
             None
         };
         let mut pod_template_labels = balancer.default_labels();
-        pod_template_labels.extend(recommended_k8s_labels(balancer.app_name()));
         pod_template_labels.insert(
             "materialize.cloud/name".to_owned(),
             balancer.deployment_name(),
@@ -355,10 +354,13 @@ impl Context {
             ..Default::default()
         };
 
+        let match_labels = pod_template_labels.clone();
+        pod_template_labels.extend(recommended_k8s_labels(balancer.app_name()));
+
         let deployment_spec = DeploymentSpec {
             replicas: Some(balancer.replicas()),
             selector: LabelSelector {
-                match_labels: Some(pod_template_labels.clone()),
+                match_labels: Some(match_labels),
                 ..Default::default()
             },
             strategy: Some(DeploymentStrategy {

src/orchestratord/src/controller/console.rs

@@ -39,7 +39,7 @@ use tracing::{trace, warn};
 
 use crate::{
     Error,
-    k8s::{apply_resource, get_resource, replace_resource},
+    k8s::{apply_resource, get_resource, recommended_k8s_labels, replace_resource},
     tls::{DefaultCertificateSpecs, create_certificate, issuer_ref_defined},
 };
 use mz_cloud_resources::crd::{
@@ -402,10 +402,13 @@ ssl_certificate_key /nginx/tls/tls.key;",
             ..Default::default()
         };
 
+        let match_labels = pod_template_labels.clone();
+        pod_template_labels.extend(recommended_k8s_labels("console".into()));
+
         let deployment_spec = DeploymentSpec {
             replicas: Some(console.replicas()),
             selector: LabelSelector {
-                match_labels: Some(pod_template_labels.clone()),
+                match_labels: Some(match_labels),
                 ..Default::default()
             },
             template: PodTemplateSpec {

src/orchestratord/src/controller/materialize/generation.rs

@@ -43,8 +43,8 @@ use super::matching_image_from_environmentd_image_ref;
 use crate::k8s::{apply_resource, delete_resource, get_resource};
 use crate::tls::issuer_ref_defined;
 use mz_cloud_provider::CloudProvider;
-use mz_cloud_resources::crd::ManagedResource;
 use mz_cloud_resources::crd::materialize::v1alpha1::Materialize;
+use mz_cloud_resources::crd::{ManagedResource, recommended_k8s_labels};
 use mz_ore::instrument;
 
 static V140_DEV0: LazyLock<Version> = LazyLock::new(|| Version {
@@ -1131,11 +1131,7 @@ fn create_environmentd_statefulset_object(
         "materialize.cloud/app".to_owned(),
         mz.environmentd_app_name(),
     );
-    pod_template_labels.insert("app".to_owned(), "environmentd".to_string());
-    pod_template_labels.insert(
-        "app.kubernetes.io/name".to_owned(),
-        "environmentd".to_string(),
-    );
+    pod_template_labels.extend(recommended_k8s_labels("environmentd".into()));
     pod_template_labels.extend(
         mz.spec
             .pod_labels

src/orchestratord/src/k8s.rs

@@ -200,6 +200,8 @@ pub fn recommended_k8s_labels(app_name: String) -> BTreeMap<String, String> {
         "materialize-operator".into(),
     );
     labels.insert("app.kubernetes.io/part-of".into(), "materialize".into());
-    labels.insert("app.kubernetes.io/name".into(), app_name);
+    labels.insert("app.kubernetes.io/name".into(), app_name.to_owned());
+    // legacy label
+    labels.insert("app".into(), app_name.to_owned());
     labels
 }