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

Jump to bottom

Add modeled types for URLs and Kubernetes resources #549

Merged
merged 1 commit into from
Nov 21, 2019
Merged

Add modeled types for URLs and Kubernetes resources #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions workspaces/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions workspaces/api/apiserver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@ build = "build.rs"
[dependencies]
actix-web = { version = "1.0.5", default-features = false, features = ["uds"] }
base64 = "0.10"
lazy_static = "1.2"
libc = "0.2"
log = "0.4"
nix = "0.15.0"
percent-encoding = "2.1"
regex = "1.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
simplelog = "0.7"
snafu = "0.5"
systemd = { version = "0.4.0", default-features = false, features = [], optional = true }
toml = "0.5"
url = "2.1"
walkdir = "2.2"
systemd = { version = "0.4.0", default-features = false, features = [], optional = true }
nix = "0.15.0"
libc = "0.2"

[features]
default = ["sd_notify"]
Expand Down
21 changes: 12 additions & 9 deletions workspaces/api/apiserver/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::net::Ipv4Addr;

use crate::modeled_types::{SingleLineString, ValidBase64, Identifier};
use crate::modeled_types::{
Identifier, KubernetesClusterName, KubernetesLabelKey, KubernetesLabelValue,
KubernetesTaintValue, SingleLineString, Url, ValidBase64,
};

///// Primary user-visible settings

Expand Down Expand Up @@ -47,19 +50,19 @@ pub struct KubernetesSettings {
// Settings we require the user to specify, likely via user data.

#[serde(skip_serializing_if = "Option::is_none")]
pub cluster_name: Option<SingleLineString>,
pub cluster_name: Option<KubernetesClusterName>,

#[serde(skip_serializing_if = "Option::is_none")]
pub cluster_certificate: Option<ValidBase64>,

#[serde(skip_serializing_if = "Option::is_none")]
pub api_server: Option<SingleLineString>,
pub api_server: Option<Url>,

#[serde(skip_serializing_if = "Option::is_none")]
pub node_labels: Option<HashMap<SingleLineString, SingleLineString>>,
pub node_labels: Option<HashMap<KubernetesLabelKey, KubernetesLabelValue>>,

#[serde(skip_serializing_if = "Option::is_none")]
pub node_taints: Option<HashMap<SingleLineString, SingleLineString>>,
pub node_taints: Option<HashMap<KubernetesLabelKey, KubernetesTaintValue>>,

// Dynamic settings.

Expand All @@ -82,10 +85,10 @@ pub struct KubernetesSettings {
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
pub struct UpdatesSettings {
#[serde(skip_serializing_if = "Option::is_none")]
pub metadata_base_url: Option<SingleLineString>,
pub metadata_base_url: Option<Url>,

#[serde(skip_serializing_if = "Option::is_none")]
pub target_base_url: Option<SingleLineString>,
pub target_base_url: Option<Url>,

#[serde(skip_serializing_if = "Option::is_none")]
pub seed: Option<u32>,
Expand All @@ -95,7 +98,7 @@ pub struct UpdatesSettings {
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
pub struct ContainerImage {
#[serde(skip_serializing_if = "Option::is_none")]
pub source: Option<SingleLineString>,
pub source: Option<Url>,

#[serde(skip_serializing_if = "Option::is_none")]
pub enabled: Option<bool>,
Expand All @@ -109,7 +112,7 @@ pub struct ContainerImage {
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
pub struct NtpSettings {
#[serde(skip_serializing_if = "Option::is_none")]
pub time_servers: Option<Vec<SingleLineString>>,
pub time_servers: Option<Vec<Url>>,
}

///// Internal services
Expand Down
Loading