Skip to content

Commit

Permalink
Replaced plain json with structs in Namespace and Deployment definiti…
Browse files Browse the repository at this point in the history 
…on (BFT-430) (#68)

## What ❔
Improves code quality replacing json defined structures by
`k8s_openapi`structs

## Why ❔

A comment in PR #62 suggested to use rust types instead of json strings
to declare k8s structures.
In order to get that PR merged I created a [new
sub-issue](https://linear.app/matterlabs/issue/BFT-430/define-k8s-structs-using-rust-types-instead-of-json-strings)
and this PR solves it

---------

Co-authored-by: IAvecilla <[email protected]>
Co-authored-by: Nacho Avecilla <[email protected]>
Co-authored-by: Bruno França <[email protected]>
Co-authored-by: Grzegorz Prusak <[email protected]>
  • Loading branch information
@ElFantasma @IAvecilla
@brunoffranca @pompon0
5 people authored Feb 28, 2024
1 parent f03b302 commit 5136953
Showing 1 changed file with 99 additions and 85 deletions.
184 changes: 99 additions & 85 deletions node/tools/src/k8s.rs
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
use crate::{config, NodeAddr};
use anyhow::{anyhow, Context};
use k8s_openapi::api::{
apps::v1::Deployment,
core::v1::{Namespace, Pod},
use k8s_openapi::{
api::{
apps::v1::{Deployment, DeploymentSpec},
core::v1::{
Container, ContainerPort, EnvVar, EnvVarSource, HTTPGetAction, Namespace,
ObjectFieldSelector, Pod, PodSpec, PodTemplateSpec, Probe,
},
},
apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString::Int},
};
use kube::{
api::{ListParams, PostParams},
core::ObjectList,
core::{ObjectList, ObjectMeta},
Api, Client, ResourceExt,
};
use serde_json::json;
use std::collections::HashMap;
use std::collections::{BTreeMap, HashMap};
use tokio_retry::strategy::FixedInterval;
use tokio_retry::Retry;
use tracing::log::info;
Expand All @@ -26,16 +31,14 @@ pub async fn create_or_reuse_namespace(client: &Client, name: &str) -> anyhow::R
let namespaces: Api<Namespace> = Api::all(client.clone());
match namespaces.get_opt(name).await? {
None => {
let namespace: Namespace = serde_json::from_value(json!({
"apiVersion": "v1",
"kind": "Namespace",
"metadata": {
"name": name,
"labels": {
"name": name
}
}
}))?;
let namespace = Namespace {
metadata: ObjectMeta {
name: Some(name.to_owned()),
labels: Some(BTreeMap::from([("name".to_owned(), name.to_owned())])),
..Default::default()
},
..Default::default()
};

let namespaces: Api<Namespace> = Api::all(client.clone());
let post_params = PostParams::default();
Expand Down Expand Up @@ -73,76 +76,87 @@ pub async fn deploy_node(
) -> anyhow::Result<()> {
let cli_args = get_cli_args(peers);
let node_name = format!("consensus-node-{node_index:0>2}");
let deployment: Deployment = serde_json::from_value(json!({
"apiVersion": "apps/v1",
"kind": "Deployment",
"metadata": {
"name": node_name,
"namespace": namespace
},
"spec": {
"selector": {
"matchLabels": {
"app": node_name
}
let deployment = Deployment {
metadata: ObjectMeta {
name: Some(node_name.to_owned()),
namespace: Some(namespace.to_owned()),
..Default::default()
},
spec: Some(DeploymentSpec {
selector: LabelSelector {
match_labels: Some(BTreeMap::from([("app".to_owned(), node_name.to_owned())])),
..Default::default()
},
"replicas": 1,
"template": {
"metadata": {
"labels": {
"app": node_name,
"id": node_name,
"seed": is_seed.to_string()
}
},
"spec": {
"containers": [
{
"name": node_name,
"image": "consensus-node",
"env": [
{
"name": "NODE_ID",
"value": node_name
},
{
"name": "PUBLIC_ADDR",
"valueFrom": {
"fieldRef": {
"fieldPath": "status.podIP"
}
}
}
],
"command": ["./k8s_entrypoint.sh"],
"args": cli_args,
"imagePullPolicy": "Never",
"ports": [
{
"containerPort": config::NODES_PORT
},
{
"containerPort": 3154
}
],
"livenessProbe": {
"httpGet": {
"path": "/health",
"port": 3154
}
},
"readinessProbe": {
"httpGet": {
"path": "/health",
"port": 3154
}
}
}
]
}
}
}
}))?;
replicas: Some(1),
template: PodTemplateSpec {
metadata: Some(ObjectMeta {
labels: Some(BTreeMap::from([
("app".to_owned(), node_name.to_owned()),
("id".to_owned(), node_name.to_owned()),
("seed".to_owned(), is_seed.to_string()),
])),
..Default::default()
}),
spec: Some(PodSpec {
containers: vec![Container {
name: node_name.to_owned(),
image: Some("consensus-node".to_owned()),
env: Some(vec![
EnvVar {
name: "NODE_ID".to_owned(),
value: Some(node_name.to_owned()),
..Default::default()
},
EnvVar {
name: "PUBLIC_ADDR".to_owned(),
value_from: Some(EnvVarSource {
field_ref: Some(ObjectFieldSelector {
field_path: "status.podIP".to_owned(),
..Default::default()
}),
..Default::default()
}),
..Default::default()
},
]),
command: Some(vec!["./k8s_entrypoint.sh".to_owned()]),
args: Some(cli_args),
image_pull_policy: Some("Never".to_owned()),
ports: Some(vec![
ContainerPort {
container_port: i32::from(config::NODES_PORT),
..Default::default()
},
ContainerPort {
container_port: 3154,
..Default::default()
},
]),
liveness_probe: Some(Probe {
http_get: Some(HTTPGetAction {
path: Some("/health".to_owned()),
port: Int(3154),
..Default::default()
}),
..Default::default()
}),
readiness_probe: Some(Probe {
http_get: Some(HTTPGetAction {
path: Some("/health".to_owned()),
port: Int(3154),
..Default::default()
}),
..Default::default()
}),
..Default::default()
}],
..Default::default()
}),
},
..Default::default()
}),
..Default::default()
};

let deployments: Api<Deployment> = Api::namespaced(client.clone(), namespace);
let post_params = PostParams::default();
Expand Down

0 comments on commit 5136953

Please sign in to comment.