Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add secondary route with key on host #14

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Add secondary route with key on host #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3a7d4a
feat: added plugin to accept dmtr key on hostname
paulobressan Jan 9, 2024
28e4e5d
feat: added secondary route with key on hostname
paulobressan Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions bootstrap/crds/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ resource "kubernetes_manifest" "customresourcedefinition_kupoports_demeter_run"
"type" = "string"
},
{
"jsonPath" = ".spec.authentication"
"name" = "Authentication"
"jsonPath" = ".status.endpoint_key_url"
"name" = "Endpoint Key URL"
"type" = "string"
},
{
Expand All @@ -58,13 +58,6 @@ resource "kubernetes_manifest" "customresourcedefinition_kupoports_demeter_run"
"properties" = {
"spec" = {
"properties" = {
"authentication" = {
"enum" = [
"none",
"apiKey",
]
"type" = "string"
}
"network" = {
"enum" = [
"mainnet",
Expand All @@ -85,7 +78,6 @@ resource "kubernetes_manifest" "customresourcedefinition_kupoports_demeter_run"
}
}
"required" = [
"authentication",
"network",
"operatorVersion",
"pruneUtxo",
Expand All @@ -97,14 +89,20 @@ resource "kubernetes_manifest" "customresourcedefinition_kupoports_demeter_run"
"nullable" = true
"properties" = {
"authToken" = {
"nullable" = true
"type" = "string"
}
"endpointKeyUrl" = {
"type" = "string"
}
"endpointUrl" = {
"nullable" = true
"type" = "string"
}
}
"required" = [
"authToken",
"endpointKeyUrl",
"endpointUrl",
]
"type" = "object"
}
}
Expand Down
50 changes: 32 additions & 18 deletions operator/src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use futures::StreamExt;
use kube::{
api::ListParams,
runtime::{controller::Action, watcher::Config as WatcherConfig, Controller},
Api, Client, CustomResource,
Api, Client, CustomResource, CustomResourceExt, ResourceExt,
};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
Expand All @@ -11,8 +11,8 @@ use tracing::{error, info, instrument};

use crate::{
auth::handle_auth,
gateway::{handle_http_route, handle_reference_grant},
Error, Metrics, Network, Result, State,
gateway::{handle_http_route, handle_http_route_key, handle_reference_grant},
patch_resource_status, Error, Metrics, Network, Result, State,
};

pub static KUPO_PORT_FINALIZER: &str = "kupoports.demeter.run";
Expand All @@ -27,13 +27,6 @@ impl Context {
}
}

#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
#[serde(rename_all = "camelCase")]
pub enum Authentication {
None,
ApiKey,
}

#[derive(CustomResource, Deserialize, Serialize, Clone, Debug, JsonSchema)]
#[kube(
kind = "KupoPort",
Expand All @@ -48,7 +41,7 @@ pub enum Authentication {
{"name": "Pruned", "jsonPath": ".spec.pruneUtxo", "type": "boolean"},
{"name": "Throughput Tier", "jsonPath":".spec.throughputTier", "type": "string"},
{"name": "Endpoint URL", "jsonPath": ".status.endpointUrl", "type": "string"},
{"name": "Authentication", "jsonPath": ".spec.authentication", "type": "string"},
{"name": "Endpoint Key URL", "jsonPath": ".status.endpoint_key_url", "type": "string"},
{"name": "Auth Token", "jsonPath": ".status.authToken", "type": "string"}
"#)]
#[serde(rename_all = "camelCase")]
Expand All @@ -58,21 +51,42 @@ pub struct KupoPortSpec {
pub prune_utxo: bool,
// throughput should be 0, 1, 2
pub throughput_tier: String,
pub authentication: Authentication,
}

#[derive(Deserialize, Serialize, Clone, Default, Debug, JsonSchema)]
#[serde(rename_all = "camelCase")]
pub struct KupoPortStatus {
pub endpoint_url: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub auth_token: Option<String>,
pub endpoint_url: String,
pub endpoint_key_url: String,
pub auth_token: String,
}

async fn reconcile(crd: Arc<KupoPort>, ctx: Arc<Context>) -> Result<Action> {
handle_reference_grant(ctx.client.clone(), &crd).await?;
handle_http_route(ctx.client.clone(), &crd).await?;
handle_auth(ctx.client.clone(), &crd).await?;
handle_reference_grant(&ctx.client, &crd).await?;

let key = handle_auth(&ctx.client, &crd).await?;
let hostname = handle_http_route(&ctx.client, &crd).await?;
let hostname_key = handle_http_route_key(&ctx.client, &crd, &key).await?;

let status = KupoPortStatus {
endpoint_url: format!("https://{hostname}"),
endpoint_key_url: format!("https://{hostname_key}"),
auth_token: key,
};

let namespace = crd.namespace().unwrap();
let kupo_port = KupoPort::api_resource();

patch_resource_status(
ctx.client.clone(),
&namespace,
kupo_port,
&crd.name_any(),
serde_json::to_value(status)?,
)
.await?;

info!(resource = crd.name_any(), "Reconcile completed");

Ok(Action::await_change())
}
Expand Down
Loading