feat: remove nesting
Some checks reported errors
continuous-integration/drone/push Build encountered an error

Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen 2024-05-27 22:50:51 +02:00
parent 22319ce56d
commit ef737418c3
Signed by: kjuulh
GPG Key ID: 9AA7BC13CE474394
4 changed files with 32 additions and 29 deletions

12
Cargo.lock generated
View File

@ -906,9 +906,9 @@ dependencies = [
[[package]]
name = "clang-sys"
version = "1.7.0"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
checksum = "a483f3cbf7cec2e153d424d0e92329d816becc6421389bd494375c6065921b9b"
dependencies = [
"glob",
"libc",
@ -1040,9 +1040,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
[[package]]
name = "crc32c"
version = "0.6.5"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2"
checksum = "716b38bb6e49e9071060ab2c5e26195b70274f83fdf6cbc44542d63bb2f45c7d"
dependencies = [
"rustc_version",
]
@ -1136,7 +1136,7 @@ dependencies = [
[[package]]
name = "cuddle-clusters"
version = "0.1.0"
source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?branch=main#f24f2706ae3d6218e1eedf52191674eab468ba94"
source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?branch=main#c08dcb049d39e0d363a6c102b59d620f82acdc1a"
dependencies = [
"anyhow",
"clap",
@ -1615,7 +1615,7 @@ dependencies = [
[[package]]
name = "flux-releaser"
version = "0.1.0"
source = "git+https://git.front.kjuulh.io/kjuulh/flux-releaser?branch=main#3ca0a836ca9382dfc53ecc159a7ddc10e08e6755"
source = "git+https://git.front.kjuulh.io/kjuulh/flux-releaser?branch=main#44ae9c2d2b1fbf418d2894e9a608671ecac6f187"
dependencies = [
"anyhow",
"async-trait",

View File

@ -2,7 +2,7 @@ use std::collections::HashMap;
use std::path::PathBuf;
use async_trait::async_trait;
use cuddle_ci::cuddle_file::{self, CuddleFile};
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 +11,7 @@ use cuddle_ci::{Context, CuddleCI, MainAction, PullRequestAction};
use cuddle_clusters::catalog::cluster_vars::ClusterVars;
use cuddle_clusters::catalog::crdb_database::CockroachDB;
use cuddle_clusters::catalog::cuddle_vars::CuddleVars;
use cuddle_clusters::catalog::ingress::Ingress;
use cuddle_clusters::catalog::vault_secret::VaultSecret;
use cuddle_clusters::releaser::Releaser;
use cuddle_clusters::IntoComponent;
@ -81,6 +82,10 @@ impl RustServiceRender {
.await
.map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
.into_component(),
Ingress::new(&std::env::current_dir()?)
.await
.map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
.into_component(),
],
cuddle_clusters::process::ProcessOpts {
path: std::env::current_dir()?,

View File

@ -7,7 +7,6 @@ metadata:
namespace: {{ cluster_namespace }}
data:
{%- if (vars.cluster_vars.env | items | length) > 0 %}
environment:
{%- for (name, value) in vars.cluster_vars.env | dictsort %}
{{name | upper | replace(".", "_") | replace("-", "_") }}: {{value}}
{%- endfor %}

View File

@ -1,12 +1,17 @@
{%- set service_name = vars.cuddle_vars.service -%}
{%- set cluster_name = vars.cluster_vars.name -%}
{%- set cluster_namespace = vars.cluster_vars.namespace -%}
apiVersion: v1
kind: Service
metadata:
labels:
app: {{ vars.cuddle_vars.service }}
cluster: {{ environment }}
name: {{ vars.cuddle_vars.service }}
namespace: {{ vars.cluster_vars.namespace }}
name: "{{ service_name }}"
namespace: {{ cluster_namespace }}
spec:
selector:
app: {{ service_name }}
cluster: {{ cluster_name }}
type: LoadBalancer
ports:
- name: external-http
port: 3000
@ -17,10 +22,4 @@ spec:
- name: internal-grpc
port: 3002
targetPort: 3002
- name: external-grpc
port: 7900
targetPort: 7900
selector:
app: {{ vars.cuddle_vars.service }}
cluster: {{ environment }}
type: LoadBalancer