diff --git a/crates/cuddle-rust-service-plan/src/main.rs b/crates/cuddle-rust-service-plan/src/main.rs index 5de1b6a..b145638 100644 --- a/crates/cuddle-rust-service-plan/src/main.rs +++ b/crates/cuddle-rust-service-plan/src/main.rs @@ -1,6 +1,7 @@ use std::sync::Arc; use async_trait::async_trait; +use cuddle_ci::cuddle_file::CuddleFile; use cuddle_ci::cuddle_releaser::CuddleReleaser; use cuddle_ci::rust_service::architecture::{Architecture, Os}; use cuddle_ci::rust_service::RustService; @@ -11,6 +12,7 @@ use tokio::sync::Mutex; #[tokio::main] async fn main() -> eyre::Result<()> { let client = dagger_sdk::connect().await?; + let cuddle_file = CuddleFile::from_cuddle_file().await?; let service = RustService::from(client.clone()) .with_arch(Architecture::Amd64) @@ -18,9 +20,9 @@ async fn main() -> eyre::Result<()> { .with_apt(&["libssl-dev", "libz-dev", "libpq-dev"]) .with_apt_release(&["libssl-dev", "libz-dev", "libpq-dev"]) .with_apt_ca_certificates() - .with_crates(["ci", "crates/*"]) + .with_crates(["crates/*"]) .with_mold("2.3.3") - .with_bin_name("cuddle-rust-service-plan") + .with_bin_name(cuddle_file.vars.service) .with_deployment(false) .to_owned(); diff --git a/templates/kustomize/base/deployment.yaml b/templates/kustomize/base/deployment.yaml index 7b9ecdf..69aa899 100644 --- a/templates/kustomize/base/deployment.yaml +++ b/templates/kustomize/base/deployment.yaml @@ -13,8 +13,8 @@ spec: image: "deployment:latest" ports: - containerPort: 3000 - name: external_http + name: external-http - containerPort: 3001 - name: internal_http + name: internal-http - containerPort: 3002 - name: internal_grpc + name: internal-grpc diff --git a/templates/kustomize/base/service.yaml b/templates/kustomize/base/service.yaml index b259376..beeccf8 100644 --- a/templates/kustomize/base/service.yaml +++ b/templates/kustomize/base/service.yaml @@ -5,13 +5,13 @@ metadata: spec: type: LoadBalancer ports: - - name: external_http + - name: external-http port: 3000 targetPort: 3000 - - name: internal_http + - name: internal-http port: 3001 targetPort: 3001 - - name: internal_grpc + - name: internal-grpc port: 3002 targetPort: 3002