Start roughing out K8s deployment spec for api-server; bootstrap global locks AFTER DB migrations have run
This commit is contained in:
parent
0ce3ba0512
commit
ed7b167167
11
Dockerfile
11
Dockerfile
@ -1,21 +1,14 @@
|
|||||||
FROM ubuntu:24.04
|
FROM ubuntu:24.04
|
||||||
|
|
||||||
RUN groupadd --gid 3450 p5x \
|
RUN mkdir -p /p5x/data
|
||||||
&& useradd --uid 3450 --gid 3450 p5x \
|
|
||||||
&& mkdir -p /p5x/data \
|
|
||||||
&& chown -R p5x:p5x /p5x \
|
|
||||||
&& chmod 755 /p5x \
|
|
||||||
&& usermod -d /p5x p5x
|
|
||||||
|
|
||||||
COPY ./target/x86_64-unknown-linux-gnu/release/p5x /p5x/p5x
|
COPY ./target/x86_64-unknown-linux-gnu/release/p5x /p5x/p5x
|
||||||
COPY Rocket.toml /p5x/Rocket.toml
|
COPY Rocket.toml /p5x/Rocket.toml
|
||||||
|
|
||||||
WORKDIR /p5x
|
|
||||||
USER p5x:p5x
|
|
||||||
|
|
||||||
ENV ROCKET_PROFILE="docker"
|
ENV ROCKET_PROFILE="docker"
|
||||||
ENV RUST_LOG="p5x=debug,sqlx=warn,info"
|
ENV RUST_LOG="p5x=debug,sqlx=warn,info"
|
||||||
ENV P5X_SSH_PUBKEY_PATH="/p5x/data/ssh-pubkey.pem"
|
ENV P5X_SSH_PUBKEY_PATH="/p5x/data/ssh-pubkey.pem"
|
||||||
ENV P5X_SSH_PRIVKEY_PATH="/p5x/data/ssh-privkey.pem"
|
ENV P5X_SSH_PRIVKEY_PATH="/p5x/data/ssh-privkey.pem"
|
||||||
|
|
||||||
|
WORKDIR /p5x
|
||||||
CMD ["/p5x/p5x", "api-server"]
|
CMD ["/p5x/p5x", "api-server"]
|
||||||
|
1
deploy/.gitignore
vendored
Normal file
1
deploy/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
10-environment.yaml
|
5
deploy/0-namespace.yaml
Normal file
5
deploy/0-namespace.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Namespace
|
||||||
|
metadata:
|
||||||
|
name: p5x-system
|
27
deploy/20-volume.yaml
Normal file
27
deploy/20-volume.yaml
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: PersistentVolume
|
||||||
|
metadata:
|
||||||
|
name: system-data
|
||||||
|
namespace: p5x-system
|
||||||
|
spec:
|
||||||
|
capacity:
|
||||||
|
storage: 5Gi
|
||||||
|
volumeMode: Filesystem
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteOnce
|
||||||
|
persistentVolumeReclaimPolicy: Retain
|
||||||
|
storageClassName: local-storage
|
||||||
|
local:
|
||||||
|
path: /mnt/p5x-system-data
|
||||||
|
claimRef:
|
||||||
|
namespace: p5x-system
|
||||||
|
name: system-data
|
||||||
|
nodeAffinity:
|
||||||
|
required:
|
||||||
|
nodeSelectorTerms:
|
||||||
|
- matchExpressions:
|
||||||
|
- key: kubernetes.io/hostname
|
||||||
|
operator: In
|
||||||
|
values:
|
||||||
|
- control.k8s
|
14
deploy/22-volumeclaim.yaml
Normal file
14
deploy/22-volumeclaim.yaml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: PersistentVolumeClaim
|
||||||
|
metadata:
|
||||||
|
name: system-data
|
||||||
|
namespace: p5x-system
|
||||||
|
spec:
|
||||||
|
storageClassName: local
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteOnce
|
||||||
|
volumeName: system-data
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 5Gi
|
51
deploy/40-statefulset.yaml
Normal file
51
deploy/40-statefulset.yaml
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: StatefulSet
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/component: api-server
|
||||||
|
app.kubernetes.io/name: p5x-api-server
|
||||||
|
name: p5x-api-server
|
||||||
|
namespace: p5x-system
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: p5x-api-server
|
||||||
|
serviceName: p5x-api-server
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: p5x-api-server
|
||||||
|
spec:
|
||||||
|
priorityClassName: system-cluster-critical
|
||||||
|
volumes:
|
||||||
|
- name: p5x-system-data
|
||||||
|
persistentVolumeClaim:
|
||||||
|
claimName: system-data
|
||||||
|
containers:
|
||||||
|
- name: api-server
|
||||||
|
image: registry.millslan.net/glmdev/p5x-api:latest
|
||||||
|
# TODO: (1) add a dedicated /healthz endpoint and (2) prevent that endpoint from writing to the Rocket logs
|
||||||
|
# livenessProbe:
|
||||||
|
# failureThreshold: 5
|
||||||
|
# httpGet:
|
||||||
|
# path: /system/pubkey
|
||||||
|
# port: p5x
|
||||||
|
# initialDelaySeconds: 10
|
||||||
|
# periodSeconds: 120
|
||||||
|
# timeoutSeconds: 10
|
||||||
|
envFrom:
|
||||||
|
- configMapRef:
|
||||||
|
name: api-env
|
||||||
|
env:
|
||||||
|
- name: P5X_NODE_HOSTNAME
|
||||||
|
valueFrom:
|
||||||
|
fieldRef:
|
||||||
|
fieldPath: spec.nodeName
|
||||||
|
ports:
|
||||||
|
- containerPort: 3450
|
||||||
|
name: p5x
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /p5x/data
|
||||||
|
name: p5x-system-data
|
@ -6,4 +6,4 @@ if ! [ -f Cargo.toml ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cargo build --release --target x86_64-unknown-linux-gnu
|
cargo build --release --target x86_64-unknown-linux-gnu
|
||||||
docker build -t "${DOCKER_REGISTRY}/p5x-rs:latest" .
|
docker build -t "${DOCKER_REGISTRY}/glmdev/p5x-api:latest" .
|
||||||
|
3
scripts/push.sh
Executable file
3
scripts/push.sh
Executable file
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
docker push "${DOCKER_REGISTRY}/glmdev/p5x-api:latest"
|
@ -24,4 +24,4 @@ fi
|
|||||||
echo ""
|
echo ""
|
||||||
echo "Running p5x..."
|
echo "Running p5x..."
|
||||||
echo ""
|
echo ""
|
||||||
docker run $P5X_ARGS "$DOCKER_REGISTRY/p5x-rs:latest"
|
docker run $P5X_ARGS "$DOCKER_REGISTRY/glmdev/p5x-api:latest"
|
||||||
|
@ -7,7 +7,6 @@ use sea_orm_rocket::{Config, Database, Pool};
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use rocket::fairing::AdHoc;
|
use rocket::fairing::AdHoc;
|
||||||
use sea_orm::ConnectOptions;
|
use sea_orm::ConnectOptions;
|
||||||
use crate::api::entity::locks::ensure_vmid_lock;
|
|
||||||
|
|
||||||
#[derive(Database, Debug)]
|
#[derive(Database, Debug)]
|
||||||
#[database("p5x_api")]
|
#[database("p5x_api")]
|
||||||
@ -43,8 +42,6 @@ impl Pool for DbPool {
|
|||||||
|
|
||||||
let conn = sea_orm::Database::connect(options).await?;
|
let conn = sea_orm::Database::connect(options).await?;
|
||||||
|
|
||||||
ensure_vmid_lock(&conn).await?; // todo: probably a better place to put this
|
|
||||||
|
|
||||||
Ok(DbPool { conn })
|
Ok(DbPool { conn })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,9 +5,22 @@ mod route;
|
|||||||
pub mod util;
|
pub mod util;
|
||||||
pub mod cluster;
|
pub mod cluster;
|
||||||
pub mod entity;
|
pub mod entity;
|
||||||
pub use db::Db;
|
use sea_orm_rocket::Database;
|
||||||
|
use db::Db;
|
||||||
|
use crate::api::entity::locks::ensure_vmid_lock;
|
||||||
|
|
||||||
pub mod services;
|
pub mod services;
|
||||||
|
|
||||||
|
/** Perform any init-time operations that require the DB. */
|
||||||
|
pub fn post_init() -> AdHoc {
|
||||||
|
AdHoc::on_ignite("post_init", |rocket| async {
|
||||||
|
let conn = &Db::fetch(&rocket).unwrap().conn;
|
||||||
|
ensure_vmid_lock(&conn).await.unwrap();
|
||||||
|
|
||||||
|
rocket
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
pub fn init() -> AdHoc {
|
pub fn init() -> AdHoc {
|
||||||
AdHoc::on_ignite("mod(db)", |rocket| async {
|
AdHoc::on_ignite("mod(db)", |rocket| async {
|
||||||
rocket.attach(db::init())
|
rocket.attach(db::init())
|
||||||
|
Loading…
Reference in New Issue
Block a user