Compare commits
20 Commits
d0e031af2b
...
renovate/a
Author | SHA1 | Date | |
---|---|---|---|
11c10fa0e6 | |||
277c09d490 | |||
5f522e314b | |||
e1f1d2429e | |||
24722e1550 | |||
b21a5d8647 | |||
730ae66c2b | |||
6f0f60286d | |||
87e3256660 | |||
1c6198b97a | |||
f3aef000ef | |||
b6b608ca1f
|
|||
cce311cfa3
|
|||
d6cc3ae5c5
|
|||
9a9734b2d7
|
|||
2712707da8
|
|||
0c6ba3d630
|
|||
227bbcef8e
|
|||
ac3c5d3672
|
|||
4c3c67c84d |
936
Cargo.lock
generated
936
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@ edition = "2021"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
|
|
||||||
dagger-sdk = "0.13.7"
|
dagger-sdk = "0.18.0"
|
||||||
eyre = { version = "0.6.12" }
|
eyre = { version = "0.6.12" }
|
||||||
|
|
||||||
dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }
|
dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }
|
||||||
|
@@ -6,7 +6,7 @@ edition = "2021"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
|
|
||||||
dagger-sdk = "0.13.7"
|
dagger-sdk = "0.18.0"
|
||||||
eyre = { version = "0.6.12" }
|
eyre = { version = "0.6.12" }
|
||||||
|
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
|
@@ -14,6 +14,7 @@ use cuddle_clusters::catalog::cluster_vars::ClusterVars;
|
|||||||
use cuddle_clusters::catalog::crdb_database::CockroachDB;
|
use cuddle_clusters::catalog::crdb_database::CockroachDB;
|
||||||
use cuddle_clusters::catalog::cuddle_vars::CuddleVars;
|
use cuddle_clusters::catalog::cuddle_vars::CuddleVars;
|
||||||
use cuddle_clusters::catalog::ingress::Ingress;
|
use cuddle_clusters::catalog::ingress::Ingress;
|
||||||
|
use cuddle_clusters::catalog::postgres_database::PostgresDatabase;
|
||||||
use cuddle_clusters::catalog::vault_secret::VaultSecret;
|
use cuddle_clusters::catalog::vault_secret::VaultSecret;
|
||||||
use cuddle_clusters::releaser::Releaser;
|
use cuddle_clusters::releaser::Releaser;
|
||||||
use cuddle_clusters::IntoComponent;
|
use cuddle_clusters::IntoComponent;
|
||||||
@@ -46,13 +47,12 @@ async fn main() -> eyre::Result<()> {
|
|||||||
let deployment = &CuddleReleaser::new(client.clone()).await?;
|
let deployment = &CuddleReleaser::new(client.clone()).await?;
|
||||||
|
|
||||||
let mut ci = CuddleCI::default();
|
let mut ci = CuddleCI::default();
|
||||||
|
|
||||||
ci.with_pull_request(service)
|
ci.with_pull_request(service)
|
||||||
.with_pull_request(render)
|
.with_pull_request(render)
|
||||||
//.with_pull_request(deployment.clone())
|
|
||||||
.with_main(service)
|
.with_main(service)
|
||||||
.with_main(render)
|
.with_main(render)
|
||||||
.with_main(deployment);
|
.with_main(deployment)
|
||||||
|
.with_release(service);
|
||||||
|
|
||||||
if cuddle_file.please.is_some() {
|
if cuddle_file.please.is_some() {
|
||||||
ci.with_main(&CuddlePlease::new(client.clone()));
|
ci.with_main(&CuddlePlease::new(client.clone()));
|
||||||
@@ -154,6 +154,10 @@ impl RustServiceRender {
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
|
.map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
|
||||||
.into_component(),
|
.into_component(),
|
||||||
|
PostgresDatabase::new(&std::env::current_dir()?)
|
||||||
|
.await
|
||||||
|
.map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
|
||||||
|
.into_component(),
|
||||||
Ingress::new(&std::env::current_dir()?)
|
Ingress::new(&std::env::current_dir()?)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
|
.map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
|
||||||
|
@@ -36,8 +36,13 @@ spec:
|
|||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: {{ vars.cuddle_crdb.file_name(service_name) }}
|
name: {{ vars.cuddle_crdb.file_name(service_name) }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if vars.vault_secret.has_values or vars.cuddle_crdb.has_values %}
|
{%- if vars.cuddle_postgres.has_values %}
|
||||||
|
- configMapRef:
|
||||||
|
name: {{ vars.cuddle_postgres.file_name(service_name) }}
|
||||||
|
{%- endif %}
|
||||||
|
{%- if vars.vault_secret.has_values or vars.cuddle_crdb.has_values or vars.cuddle_postgres.has_values %}
|
||||||
env:
|
env:
|
||||||
|
|
||||||
{%- if vars.vault_secret.has_values %}
|
{%- if vars.vault_secret.has_values %}
|
||||||
{%- for secret in vars.vault_secret.secrets %}
|
{%- for secret in vars.vault_secret.secrets %}
|
||||||
- name: {{secret | upper | replace(".", "_") | replace("-", "_") }}
|
- name: {{secret | upper | replace(".", "_") | replace("-", "_") }}
|
||||||
@@ -47,6 +52,19 @@ spec:
|
|||||||
key: {{ secret }}
|
key: {{ secret }}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
|
{#
|
||||||
|
{%- if vars.cuddle_postgres.has_values %}
|
||||||
|
{%- for env in vars.cuddle_postgres.env %}
|
||||||
|
- name: {{ env | upper | replace(".", "_") | replace("-", "_") }}
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ vars.cuddle_postgres.file_name(service_name) }}
|
||||||
|
key: {{ env }}
|
||||||
|
{%- endfor %}
|
||||||
|
{%- endif %}
|
||||||
|
#}
|
||||||
|
|
||||||
{#
|
{#
|
||||||
{%- if vars.cuddle_crdb.has_values %}
|
{%- if vars.cuddle_crdb.has_values %}
|
||||||
- name: {{vars.cuddle_crdb.env }}
|
- name: {{vars.cuddle_crdb.env }}
|
||||||
|
Reference in New Issue
Block a user