Generalize managed_resource_meta

Author: Alphadelta14

src/cloud-resources/src/crd.rs

@@ -70,15 +70,16 @@ pub struct MaterializeCertSpec {
 
 pub trait ManagedResource: Resource<DynamicType = ()> + Sized {
     fn default_labels(&self) -> BTreeMap<String, String> {
-        recommended_k8s_labels(self.app_name())
+        BTreeMap::new()
     }
 
     fn app_name(&self) -> Option<&str> {
         None
     }
 
     fn managed_resource_meta(&self, name: String) -> ObjectMeta {
-        let labels = self.default_labels();
+        let mut labels = self.default_labels();
+        labels.extend(recommended_k8s_labels(self.app_name()));
         ObjectMeta {
             namespace: Some(self.meta().namespace.clone().unwrap()),
             name: Some(name),

src/cloud-resources/src/crd/balancer.rs

@@ -17,7 +17,7 @@ use kube::{CustomResource, Resource, ResourceExt};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::crd::{ManagedResource, MaterializeCertSpec, new_resource_id, recommended_k8s_labels};
+use crate::crd::{ManagedResource, MaterializeCertSpec, new_resource_id};
 
 pub mod v1alpha1 {
     use super::*;
@@ -161,7 +161,7 @@ pub mod v1alpha1 {
 
     impl ManagedResource for Balancer {
         fn default_labels(&self) -> BTreeMap<String, String> {
-            let mut labels = BTreeMap::from_iter([
+            BTreeMap::from_iter([
                 (
                     "materialize.cloud/organization-name".to_owned(),
                     self.name_unchecked(),
@@ -175,9 +175,7 @@ pub mod v1alpha1 {
                     self.resource_id().to_owned(),
                 ),
                 ("materialize.cloud/app".to_owned(), "balancerd".to_owned()),
-            ]);
-            labels.extend(recommended_k8s_labels(Some("balancerd")));
-            labels
+            ])
         }
 
         fn app_name(&self) -> Option<&str> {

src/cloud-resources/src/crd/console.rs

@@ -16,7 +16,7 @@ use kube::{CustomResource, Resource, ResourceExt};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::crd::{ManagedResource, MaterializeCertSpec, new_resource_id, recommended_k8s_labels};
+use crate::crd::{ManagedResource, MaterializeCertSpec, new_resource_id};
 use mz_server_core::listeners::AuthenticatorKind;
 
 pub mod v1alpha1 {
@@ -156,7 +156,7 @@ pub mod v1alpha1 {
 
     impl ManagedResource for Console {
         fn default_labels(&self) -> BTreeMap<String, String> {
-            let mut labels = BTreeMap::from_iter([
+            BTreeMap::from_iter([
                 (
                     "materialize.cloud/organization-name".to_owned(),
                     self.name_unchecked(),
@@ -170,9 +170,7 @@ pub mod v1alpha1 {
                     self.resource_id().to_owned(),
                 ),
                 ("materialize.cloud/app".to_owned(), "console".to_owned()),
-            ]);
-            labels.extend(recommended_k8s_labels(Some("console")));
-            labels
+            ])
         }
 
         fn app_name(&self) -> Option<&str> {