fix(operator): mount /data PVC into git-hook deployment
GitHook controller was generating a Deployment without any persistent
storage — only a ConfigMap volume at /config. The worker needs /data to
access repo storage paths (APP_REPOS_ROOT defaults to /data/repos).
Changes:
- GitHookSpec: added storage_size field (default 10Gi), matching the
pattern already used by GitServerSpec
- git_hook.rs reconcile(): now creates a PVC ({name}-data) before the
Deployment, mounts it at /data, and sets APP_REPOS_ROOT=/data/repos
- git-hook-crd.yaml: synced storageSize field into the CRD schema
This commit is contained in:
parent
e50c31daa6
commit
3354055e6d
@ -1,4 +1,4 @@
|
|||||||
//! Controller for the `GitHook` CRD — Deployment + ConfigMap.
|
//! Controller for the `GitHook` CRD — Deployment + ConfigMap + PVC.
|
||||||
|
|
||||||
use crate::context::ReconcileState;
|
use crate::context::ReconcileState;
|
||||||
use crate::controller::app::{apply_deployment, patch_status};
|
use crate::controller::app::{apply_deployment, patch_status};
|
||||||
@ -18,6 +18,10 @@ pub async fn reconcile(gh: Arc<GitHook>, ctx: Arc<ReconcileState>) -> Result<(),
|
|||||||
let labels = std_labels();
|
let labels = std_labels();
|
||||||
let cm_name = format!("{}-config", name);
|
let cm_name = format!("{}-config", name);
|
||||||
|
|
||||||
|
// ---- PVC ----
|
||||||
|
let pvc = build_pvc(ns, name, spec, &or, &labels);
|
||||||
|
apply_pvc(client, ns, &format!("{}-data", name), &pvc).await?;
|
||||||
|
|
||||||
// ---- ConfigMap ----
|
// ---- ConfigMap ----
|
||||||
let configmap = build_configmap(ns, &cm_name, &or, &labels);
|
let configmap = build_configmap(ns, &cm_name, &or, &labels);
|
||||||
apply_configmap(client, ns, &cm_name, &configmap).await?;
|
apply_configmap(client, ns, &cm_name, &configmap).await?;
|
||||||
@ -78,13 +82,14 @@ fn build_deployment(
|
|||||||
};
|
};
|
||||||
let resources = super::app::build_resources(&spec.resources);
|
let resources = super::app::build_resources(&spec.resources);
|
||||||
|
|
||||||
// Add WORKER_ID env
|
// Add WORKER_ID and APP_REPOS_ROOT env vars
|
||||||
let worker_id = spec
|
let worker_id = spec
|
||||||
.worker_id
|
.worker_id
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| uuid::Uuid::new_v4().to_string());
|
.unwrap_or_else(|| uuid::Uuid::new_v4().to_string());
|
||||||
let mut env_vars: Vec<serde_json::Value> = env.iter().map(env_var_to_json).collect();
|
let mut env_vars: Vec<serde_json::Value> = env.iter().map(env_var_to_json).collect();
|
||||||
env_vars.push(json!({ "name": "HOOK_POOL_WORKER_ID", "value": worker_id }));
|
env_vars.push(json!({ "name": "HOOK_POOL_WORKER_ID", "value": worker_id }));
|
||||||
|
env_vars.push(json!({ "name": "APP_REPOS_ROOT", "value": "/data/repos" }));
|
||||||
|
|
||||||
json!({
|
json!({
|
||||||
"metadata": child_meta(name, ns, or, labels.clone()),
|
"metadata": child_meta(name, ns, or, labels.clone()),
|
||||||
@ -100,12 +105,21 @@ fn build_deployment(
|
|||||||
"env": env_vars,
|
"env": env_vars,
|
||||||
"imagePullPolicy": pull,
|
"imagePullPolicy": pull,
|
||||||
"resources": resources,
|
"resources": resources,
|
||||||
"volumeMounts": [{ "name": "hook-config", "mountPath": "/config" }]
|
"volumeMounts": [
|
||||||
|
{ "name": "hook-data", "mountPath": "/data" },
|
||||||
|
{ "name": "hook-config", "mountPath": "/config" }
|
||||||
|
]
|
||||||
}],
|
}],
|
||||||
"volumes": [{
|
"volumes": [
|
||||||
"name": "hook-config",
|
{
|
||||||
"configMap": { "name": cm_name }
|
"name": "hook-data",
|
||||||
}]
|
"persistentVolumeClaim": { "claimName": format!("{}-data", name) }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "hook-config",
|
||||||
|
"configMap": { "name": cm_name }
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -135,3 +149,41 @@ async fn apply_configmap(
|
|||||||
Err(e) => Err(e),
|
Err(e) => Err(e),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn build_pvc(
|
||||||
|
ns: &str,
|
||||||
|
name: &str,
|
||||||
|
spec: &GitHookSpec,
|
||||||
|
or: &crate::crd::OwnerReference,
|
||||||
|
labels: &std::collections::BTreeMap<String, String>,
|
||||||
|
) -> Value {
|
||||||
|
json!({
|
||||||
|
"metadata": child_meta(&format!("{}-data", name), ns, or, labels.clone()),
|
||||||
|
"spec": {
|
||||||
|
"accessModes": ["ReadWriteOnce"],
|
||||||
|
"resources": { "requests": { "storage": spec.storage_size } }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn apply_pvc(
|
||||||
|
client: &kube::Client,
|
||||||
|
ns: &str,
|
||||||
|
name: &str,
|
||||||
|
body: &Value,
|
||||||
|
) -> Result<(), kube::Error> {
|
||||||
|
let api: kube::Api<JsonResource> = kube::Api::namespaced(client.clone(), ns);
|
||||||
|
let jr = JsonResource::new(Default::default(), body.clone());
|
||||||
|
match api.get(name).await {
|
||||||
|
Ok(_) => {
|
||||||
|
// PVCs are immutable except for labels/annotations — skip update
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Err(kube::Error::Api(e)) if e.code == 404 => {
|
||||||
|
info!(name, ns, "creating git-hook PVC");
|
||||||
|
let _ = api.create(&kube::api::PostParams::default(), &jr).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Err(e) => Err(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -407,11 +407,16 @@ pub struct GitHookSpec {
|
|||||||
pub image_pull_policy: String,
|
pub image_pull_policy: String,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub worker_id: Option<String>,
|
pub worker_id: Option<String>,
|
||||||
|
#[serde(default = "default_githook_storage_size")]
|
||||||
|
pub storage_size: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_githook_image() -> String {
|
fn default_githook_image() -> String {
|
||||||
"myapp/git-hook:latest".to_string()
|
"myapp/git-hook:latest".to_string()
|
||||||
}
|
}
|
||||||
|
fn default_githook_storage_size() -> String {
|
||||||
|
"10Gi".to_string()
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
||||||
pub struct GitHookStatus {
|
pub struct GitHookStatus {
|
||||||
|
|||||||
@ -87,6 +87,9 @@ spec:
|
|||||||
default: IfNotPresent
|
default: IfNotPresent
|
||||||
workerId:
|
workerId:
|
||||||
type: string
|
type: string
|
||||||
|
storageSize:
|
||||||
|
type: string
|
||||||
|
default: 10Gi
|
||||||
status:
|
status:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user