remove console creation code from materialize operator

Author: doy-materialize

src/orchestratord/src/bin/orchestratord.rs

@@ -335,10 +335,6 @@ async fn run(args: Args) -> Result<(), anyhow::Error> {
                     clusterd_node_selector: args.clusterd_node_selector,
                     clusterd_affinity: args.clusterd_affinity,
                     clusterd_tolerations: args.clusterd_tolerations,
-                    console_node_selector: args.console_node_selector.clone(),
-                    console_affinity: args.console_affinity.clone(),
-                    console_tolerations: args.console_tolerations.clone(),
-                    console_default_resources: args.console_default_resources.clone(),
                     image_pull_policy: args.image_pull_policy,
                     network_policies_internal_enabled: args.network_policies_internal_enabled,
                     network_policies_ingress_enabled: args.network_policies_ingress_enabled,
@@ -374,8 +370,6 @@ async fn run(args: Args) -> Result<(), anyhow::Error> {
                     environmentd_internal_http_port: args.environmentd_internal_http_port,
                     environmentd_internal_persist_pubsub_port: args
                         .environmentd_internal_persist_pubsub_port,
-                    balancerd_http_port: args.balancerd_http_port,
-                    console_http_port: args.console_http_port,
                     default_certificate_specs: args.default_certificate_specs.clone(),
                     disable_license_key_checks: args.disable_license_key_checks,
                     tracing: args.tracing,

src/orchestratord/src/controller/materialize.rs

@@ -38,14 +38,14 @@ use mz_cloud_provider::CloudProvider;
 use mz_cloud_resources::crd::{
     ManagedResource,
     balancer::v1alpha1::{Balancer, BalancerSpec},
+    console::v1alpha1::{BalancerdRef, Console, ConsoleSpec},
     materialize::v1alpha1::{Materialize, MaterializeRolloutStrategy, MaterializeStatus},
 };
 use mz_license_keys::validate;
 use mz_orchestrator_kubernetes::KubernetesImagePullPolicy;
 use mz_orchestrator_tracing::TracingCliArgs;
 use mz_ore::{cast::CastFrom, cli::KeyValueArg, instrument};
 
-pub mod console;
 pub mod environmentd;
 
 pub struct Config {
@@ -84,10 +84,6 @@ pub struct Config {
     pub clusterd_node_selector: Vec<KeyValueArg<String, String>>,
     pub clusterd_affinity: Option<Affinity>,
     pub clusterd_tolerations: Option<Vec<Toleration>>,
-    pub console_node_selector: Vec<KeyValueArg<String, String>>,
-    pub console_affinity: Option<Affinity>,
-    pub console_tolerations: Option<Vec<Toleration>>,
-    pub console_default_resources: Option<ResourceRequirements>,
     pub image_pull_policy: KubernetesImagePullPolicy,
     pub network_policies_internal_enabled: bool,
     pub network_policies_ingress_enabled: bool,
@@ -116,10 +112,6 @@ pub struct Config {
     pub environmentd_internal_http_port: u16,
     pub environmentd_internal_persist_pubsub_port: u16,
 
-    pub balancerd_http_port: u16,
-
-    pub console_http_port: u16,
-
     pub default_certificate_specs: DefaultCertificateSpecs,
 
     pub disable_license_key_checks: bool,
@@ -277,6 +269,7 @@ impl k8s_controller::Context for Context {
     ) -> Result<Option<Action>, Self::Error> {
         let mz_api: Api<Materialize> = Api::namespaced(client.clone(), &mz.namespace());
         let balancer_api: Api<Balancer> = Api::namespaced(client.clone(), &mz.namespace());
+        let console_api: Api<Console> = Api::namespaced(client.clone(), &mz.namespace());
         let secret_api: Api<Secret> = Api::namespaced(client.clone(), &mz.namespace());
 
         let status = mz.status();
@@ -649,7 +642,7 @@ impl k8s_controller::Context for Context {
                         },
                     ),
                     frontegg_routing: None,
-                    resource_id: Some(status.resource_id),
+                    resource_id: Some(status.resource_id.clone()),
                 },
                 status: None,
             };
@@ -666,33 +659,50 @@ impl k8s_controller::Context for Context {
         // and the console relies on the balancer service existing, which is
         // enforced by wait_for_balancer
 
-        let Some((_, environmentd_image_tag)) = mz.spec.environmentd_image_ref.rsplit_once(':')
-        else {
-            return Err(Error::Anyhow(anyhow::anyhow!(
-                "failed to parse environmentd image ref: {}",
-                mz.spec.environmentd_image_ref
-            )));
-        };
-        let console_image_tag = self
-            .config
-            .console_image_tag_map
-            .iter()
-            .find(|kv| kv.key == environmentd_image_tag)
-            .map(|kv| kv.value.clone())
-            .unwrap_or_else(|| self.config.console_image_tag_default.clone());
-        let console = console::Resources::new(
-            &self.config,
-            mz,
-            &matching_image_from_environmentd_image_ref(
-                &mz.spec.environmentd_image_ref,
-                "console",
-                Some(&console_image_tag),
-            ),
-        );
         if self.config.create_console {
-            console.apply(&client, &mz.namespace()).await?;
+            let Some((_, environmentd_image_tag)) = mz.spec.environmentd_image_ref.rsplit_once(':')
+            else {
+                return Err(Error::Anyhow(anyhow::anyhow!(
+                    "failed to parse environmentd image ref: {}",
+                    mz.spec.environmentd_image_ref
+                )));
+            };
+            let console_image_tag = self
+                .config
+                .console_image_tag_map
+                .iter()
+                .find(|kv| kv.key == environmentd_image_tag)
+                .map(|kv| kv.value.clone())
+                .unwrap_or_else(|| self.config.console_image_tag_default.clone());
+            let console = Console {
+                metadata: mz.managed_resource_meta(mz.name_unchecked()),
+                spec: ConsoleSpec {
+                    console_image_ref: matching_image_from_environmentd_image_ref(
+                        &mz.spec.environmentd_image_ref,
+                        "console",
+                        Some(&console_image_tag),
+                    ),
+                    resource_requirements: mz.spec.console_resource_requirements.clone(),
+                    replicas: Some(mz.console_replicas()),
+                    external_certificate_spec: mz.spec.console_external_certificate_spec.clone(),
+                    pod_annotations: mz.spec.pod_annotations.clone(),
+                    pod_labels: mz.spec.pod_labels.clone(),
+                    balancerd: BalancerdRef {
+                        service_name: mz.balancerd_service_name(),
+                        namespace: mz.namespace(),
+                        external_certificate_spec: mz
+                            .spec
+                            .balancerd_external_certificate_spec
+                            .clone(),
+                        authenticator_kind: mz.spec.authenticator_kind,
+                    },
+                    resource_id: Some(status.resource_id),
+                },
+                status: None,
+            };
+            apply_resource(&console_api, &console).await?;
         } else {
-            console.cleanup(&client, &mz.namespace()).await?;
+            delete_resource(&console_api, &mz.name_prefixed("console")).await?;
         }
 
         Ok(result)