Compare commits
12 Commits
0ccfa8be98
...
cuddle-ple
Author | SHA1 | Date | |
---|---|---|---|
|
8cdf19bf6c | ||
53cc689dc4
|
|||
1c20383de6
|
|||
53c15a653f
|
|||
9c5cb6667e
|
|||
b0c40196b6
|
|||
a28a5ca6ee
|
|||
ea6bfc9c04
|
|||
844f8519d5
|
|||
1508fbb2bf
|
|||
ef6ae3f2b1
|
|||
8923c60d9e
|
165
CHANGELOG.md
Normal file
165
CHANGELOG.md
Normal file
@@ -0,0 +1,165 @@
|
||||
# Changelog
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.1.0] - 2025-01-11
|
||||
|
||||
### Added
|
||||
- add cuddle please
|
||||
- enable churn update service
|
||||
- add updater to install script
|
||||
- add updater to install script
|
||||
- add http client
|
||||
- run more often
|
||||
- enable checking if it should actually run
|
||||
- enable having get variable from local setup
|
||||
- inherit output as well
|
||||
- allow process from external code
|
||||
- add inherit
|
||||
- add default no labels
|
||||
- warn all targets
|
||||
- update with web assembly components
|
||||
- add labels to config
|
||||
- add abstraction around task
|
||||
- enable webpki roots
|
||||
- add short connect timeout
|
||||
- more error logging
|
||||
- stop the service if running
|
||||
- setup stream logging
|
||||
- update script with warn
|
||||
- disable force again
|
||||
- make curl silent"
|
||||
- force update
|
||||
- use public prod
|
||||
- run as root
|
||||
- agent is already setup
|
||||
- allow errors
|
||||
- some more debugging
|
||||
- some more debugging
|
||||
- stderr to stdout as well
|
||||
- this should work
|
||||
- when config has already been setup
|
||||
- add agent start as well
|
||||
- update with agent setup
|
||||
- add install script
|
||||
- add comments
|
||||
- use actual internal
|
||||
- reqwest as native build
|
||||
- use internal
|
||||
- add external service host
|
||||
- add grpc host
|
||||
- add external vars
|
||||
- add grpc and env
|
||||
- add queue
|
||||
- add common queue
|
||||
- add discovery
|
||||
- add tonic
|
||||
- added tonic
|
||||
- added longer timer
|
||||
- fix error message
|
||||
- add agent
|
||||
- add churn v2
|
||||
- initial v2 commit
|
||||
- reset
|
||||
- update
|
||||
- update
|
||||
- update stuff
|
||||
- update
|
||||
- with drone
|
||||
- with agent db
|
||||
- with sled db and capnp
|
||||
- with sled db
|
||||
- with basic changelog
|
||||
- with basic package
|
||||
- with publish
|
||||
- with monitoring
|
||||
- with monitor
|
||||
- with extra churning repl thingy
|
||||
- with enroll
|
||||
- add initial churn
|
||||
- add simple health check
|
||||
|
||||
### Docs
|
||||
- update readme
|
||||
next up is differentiating the different agents, such that we can execute commands from the cli to for example update dependencies on all machines, restart machines etc.
|
||||
- add installation docs
|
||||
- add notes
|
||||
|
||||
### Fixed
|
||||
- use actual names for files
|
||||
- *(deps)* update rust crate serde to v1.0.217
|
||||
- *(deps)* update rust crate serde_json to v1.0.134
|
||||
- *(deps)* update all dependencies to v28
|
||||
- *(deps)* update rust crate nodrift to 0.3.0
|
||||
- *(deps)* update rust crate serde to v1.0.216
|
||||
- *(deps)* update tokio-prost monorepo to v0.13.4
|
||||
- *(deps)* update rust crate tokio-util to v0.7.13
|
||||
- *(deps)* update rust crate bytes to v1.9.0
|
||||
- *(deps)* update rust crate tower-http to 0.6.0
|
||||
- *(deps)* update all dependencies
|
||||
- *(deps)* update rust crate capnp to 0.19.5
|
||||
- *(deps)* update rust crate capnp to 0.19.4
|
||||
|
||||
### Other
|
||||
- update final repo
|
||||
- update lock"
|
||||
- update default schedule
|
||||
- *(deps)* update rust crate anyhow to v1.0.95
|
||||
- *(deps)* update rust crate clap to v4.5.23
|
||||
- *(deps)* update all dependencies
|
||||
- *(deps)* update rust crate tracing-subscriber to v0.3.19
|
||||
- *(deps)* update rust crate tracing to v0.1.41
|
||||
- *(deps)* update rust crate serde to v1.0.215
|
||||
- *(deps)* update rust crate serde to v1.0.214
|
||||
- *(deps)* update rust crate serde to v1.0.213
|
||||
- *(deps)* update rust crate serde to v1.0.210
|
||||
- *(deps)* update rust crate serde to v1.0.209
|
||||
- *(deps)* update rust crate serde_json to v1.0.126
|
||||
- *(deps)* update all dependencies
|
||||
- *(deps)* update rust crate serde to v1.0.208
|
||||
- *(deps)* update all dependencies
|
||||
- *(deps)* update rust crate serde to v1.0.203
|
||||
- *(deps)* update rust crate anyhow to 1.0.86
|
||||
- *(deps)* update rust crate anyhow to 1.0.85
|
||||
- *(deps)* update rust crate anyhow to 1.0.84
|
||||
- *(deps)* update rust crate itertools to 0.13.0
|
||||
- *(deps)* update rust crate anyhow to 1.0.83
|
||||
- *(deps)* update rust crate reqwest to 0.12.4
|
||||
- *(deps)* update rust crate chrono to 0.4.38
|
||||
- *(deps)* update rust crate anyhow to 1.0.82
|
||||
- Merge pull request 'chore(release): v0.1.0' (#4) from cuddle-please/release into main
|
||||
|
||||
Reviewed-on: https://git.front.kjuulh.io/kjuulh/churn/pulls/4
|
||||
|
||||
- *(release)* 0.1.0
|
||||
- *(test)* test commit
|
||||
- *(test)* test commit
|
||||
- *(test)* test commit
|
||||
- *(test)* test commit
|
||||
- Merge pull request 'chore(deps): update all dependencies' (#2) from renovate/all into main
|
||||
|
||||
Reviewed-on: https://git.front.kjuulh.io/kjuulh/churn/pulls/2
|
||||
|
||||
- *(deps)* update all dependencies
|
||||
- change to byte slice
|
||||
- fmt
|
||||
- fmt
|
||||
- Add renovate.json
|
||||
|
||||
- Release churn-server v0.1.0
|
||||
|
||||
- Release churn-agent v0.1.0
|
||||
|
||||
- Release churn v0.1.0
|
||||
|
||||
- Release churn v0.1.0
|
||||
|
||||
- Release churn-domain v0.1.0, churn v0.1.0
|
||||
|
||||
- with changelog
|
||||
- Release churn-domain v0.1.0, churn v0.1.0
|
||||
|
484
Cargo.lock
generated
484
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -3,7 +3,6 @@ members = ["crates/*"]
|
||||
resolver = "2"
|
||||
|
||||
[workspace.dependencies]
|
||||
churn = { path = "crates/churn" }
|
||||
|
||||
anyhow = { version = "1" }
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
@@ -12,3 +11,6 @@ tracing-subscriber = { version = "0.3.18" }
|
||||
clap = { version = "4", features = ["derive", "env"] }
|
||||
dotenv = { version = "0.15" }
|
||||
axum = { version = "0.7" }
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.0"
|
||||
|
26
README.md
26
README.md
@@ -1 +1,27 @@
|
||||
# churn
|
||||
|
||||
## Installation
|
||||
|
||||
To install churn, you need first of all a server and agents.
|
||||
|
||||
Servers can be run via. docker.
|
||||
|
||||
```shell
|
||||
docker run docker.io/kjuulh/churn-v2:latest
|
||||
```
|
||||
|
||||
To install an agent run the following script
|
||||
|
||||
```shell
|
||||
curl https://git.front.kjuulh.io/kjuulh/churn-v2/raw/branch/main/install.sh | bash
|
||||
```
|
||||
|
||||
configure `~/.local/share/io.kjuulh.churn-agent/churn-agent.toml` use an editor of choice. Churn agent will generate a randomish name for the specific agent, consider giving it something more semantically meaningful to you
|
||||
|
||||
## CLI (TBD)
|
||||
|
||||
Using the churn cli allows sending specific commands to a set of agents
|
||||
|
||||
```
|
||||
|
||||
```
|
||||
|
@@ -18,6 +18,7 @@ impl Plan {
|
||||
Ok(vec![
|
||||
AptTask::new().into_task(),
|
||||
PluginTask::new("alloy@0.1.0", self.store.clone()).into_task(),
|
||||
PluginTask::new("dev_packages@0.1.0", self.store.clone()).into_task(),
|
||||
])
|
||||
}
|
||||
}
|
||||
|
@@ -8,7 +8,6 @@ use wasmtime::component::*;
|
||||
use wasmtime::{Config, Engine, Store};
|
||||
use wasmtime_wasi::{DirPerms, FilePerms, WasiCtx, WasiCtxBuilder, WasiView};
|
||||
|
||||
use super::agent_state::State;
|
||||
use super::config::AgentConfig;
|
||||
|
||||
wasmtime::component::bindgen!({
|
||||
@@ -16,10 +15,13 @@ wasmtime::component::bindgen!({
|
||||
//world: "churn",
|
||||
async: true,
|
||||
with: {
|
||||
"component:churn-tasks/process/process": CustomProcess
|
||||
"component:churn-tasks/process/process": CustomProcess,
|
||||
"component:churn-tasks/http/client": http::HttpClient
|
||||
}
|
||||
});
|
||||
|
||||
mod http;
|
||||
|
||||
pub struct CustomProcess {
|
||||
agent_config: AgentConfig,
|
||||
}
|
||||
@@ -75,6 +77,10 @@ impl PluginStore {
|
||||
|
||||
pub async fn execute(&self, plugin: &str) -> anyhow::Result<()> {
|
||||
let mut inner = self.inner.lock().await;
|
||||
|
||||
// FIXME: hack to avoid memory leak issues from instantiating plugins
|
||||
*inner = InnerPluginStore::new(inner.agent_config.clone())?;
|
||||
|
||||
inner.execute(plugin).await
|
||||
}
|
||||
}
|
||||
@@ -83,6 +89,7 @@ pub struct InnerPluginStore {
|
||||
store: wasmtime::Store<ServerWasiView>,
|
||||
linker: wasmtime::component::Linker<ServerWasiView>,
|
||||
engine: wasmtime::Engine,
|
||||
agent_config: AgentConfig,
|
||||
}
|
||||
|
||||
impl InnerPluginStore {
|
||||
@@ -101,13 +108,18 @@ impl InnerPluginStore {
|
||||
|state: &mut ServerWasiView| state,
|
||||
)?;
|
||||
|
||||
let wasi_view = ServerWasiView::new(agent_config);
|
||||
component::churn_tasks::http::add_to_linker(&mut linker, |state: &mut ServerWasiView| {
|
||||
state
|
||||
})?;
|
||||
|
||||
let wasi_view = ServerWasiView::new(agent_config.clone());
|
||||
let store = Store::new(&engine, wasi_view);
|
||||
|
||||
Ok(Self {
|
||||
store,
|
||||
linker,
|
||||
engine,
|
||||
agent_config,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -124,6 +136,8 @@ impl InnerPluginStore {
|
||||
pub async fn execute(&mut self, plugin: &str) -> anyhow::Result<()> {
|
||||
let plugin = self.ensure_plugin(plugin).await?;
|
||||
|
||||
self.store.gc_async().await;
|
||||
|
||||
if plugin
|
||||
.interface0
|
||||
.call_should_run(&mut self.store)
|
||||
@@ -205,6 +219,7 @@ struct ServerWasiView {
|
||||
table: ResourceTable,
|
||||
ctx: WasiCtx,
|
||||
processes: ResourceTable,
|
||||
clients: ResourceTable,
|
||||
agent_config: AgentConfig,
|
||||
}
|
||||
|
||||
@@ -215,6 +230,7 @@ impl ServerWasiView {
|
||||
let ctx = WasiCtxBuilder::new()
|
||||
.inherit_stdio()
|
||||
.inherit_stdout()
|
||||
.inherit_env()
|
||||
.inherit_stderr()
|
||||
.inherit_network()
|
||||
.preopened_dir("/", "/", DirPerms::all(), FilePerms::all())
|
||||
@@ -225,6 +241,7 @@ impl ServerWasiView {
|
||||
table,
|
||||
ctx,
|
||||
processes: ResourceTable::default(),
|
||||
clients: ResourceTable::default(),
|
||||
agent_config,
|
||||
}
|
||||
}
|
||||
@@ -279,3 +296,33 @@ impl HostProcess for ServerWasiView {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl component::churn_tasks::http::Host for ServerWasiView {}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl component::churn_tasks::http::HostClient for ServerWasiView {
|
||||
async fn new(&mut self) -> wasmtime::component::Resource<component::churn_tasks::http::Client> {
|
||||
self.clients.push(http::HttpClient::new()).unwrap()
|
||||
}
|
||||
|
||||
async fn get(
|
||||
&mut self,
|
||||
self_: wasmtime::component::Resource<component::churn_tasks::http::Client>,
|
||||
url: wasmtime::component::__internal::String,
|
||||
) -> Vec<u8> {
|
||||
let process = self.clients.get(&self_).unwrap();
|
||||
process
|
||||
.get(&url)
|
||||
.await
|
||||
.expect("to be able to make http call")
|
||||
}
|
||||
|
||||
async fn drop(
|
||||
&mut self,
|
||||
rep: wasmtime::component::Resource<component::churn_tasks::http::Client>,
|
||||
) -> wasmtime::Result<()> {
|
||||
self.clients.delete(rep)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
12
crates/churn/src/agent/plugins/http.rs
Normal file
12
crates/churn/src/agent/plugins/http.rs
Normal file
@@ -0,0 +1,12 @@
|
||||
pub struct HttpClient {}
|
||||
|
||||
impl HttpClient {
|
||||
pub fn new() -> Self {
|
||||
Self {}
|
||||
}
|
||||
|
||||
pub async fn get(&self, url: &str) -> anyhow::Result<Vec<u8>> {
|
||||
let bytes = reqwest::get(url).await?.bytes().await?;
|
||||
Ok(bytes.into())
|
||||
}
|
||||
}
|
@@ -32,7 +32,8 @@ impl notmad::Component for AgentRefresh {
|
||||
) -> Result<(), notmad::MadError> {
|
||||
// let cancel =
|
||||
// nodrift::schedule_drifter(std::time::Duration::from_secs(60 * 10), self.clone());
|
||||
let cancel = nodrift::schedule_drifter(std::time::Duration::from_secs(5), self.clone());
|
||||
let cancel =
|
||||
nodrift::schedule_drifter(std::time::Duration::from_secs(60 * 5), self.clone());
|
||||
tokio::select! {
|
||||
_ = cancel.cancelled() => {},
|
||||
_ = cancellation_token.cancelled() => {
|
||||
|
@@ -8,6 +8,13 @@ interface process {
|
||||
}
|
||||
}
|
||||
|
||||
interface http {
|
||||
resource client {
|
||||
constructor();
|
||||
get: func(url: string) -> list<u8>;
|
||||
}
|
||||
}
|
||||
|
||||
interface task {
|
||||
id: func() -> string;
|
||||
should-run: func() -> bool;
|
||||
@@ -17,4 +24,5 @@ interface task {
|
||||
world churn {
|
||||
export task;
|
||||
import process;
|
||||
import http;
|
||||
}
|
||||
|
10
cuddle.yaml
10
cuddle.yaml
@@ -14,6 +14,16 @@ vars:
|
||||
- internal: "true"
|
||||
- internal_grpc: "true"
|
||||
|
||||
please:
|
||||
project:
|
||||
owner: kjuulh
|
||||
repository: churn-v2
|
||||
branch: main
|
||||
settings:
|
||||
api_url: https://git.front.kjuulh.io
|
||||
actions:
|
||||
rust:
|
||||
|
||||
cuddle/clusters:
|
||||
dev:
|
||||
env:
|
||||
|
42
install.sh
42
install.sh
@@ -8,15 +8,23 @@ APP_VERSION="latest" # or specify a version
|
||||
S3_BUCKET="rust-artifacts"
|
||||
BINARY_NAME="churn"
|
||||
SERVICE_NAME="${APP_NAME}.service"
|
||||
SERVICE_UPDATE_NAME="${APP_NAME}-update.service"
|
||||
TIMER_UPDATE_NAME="${APP_NAME}-update.timer"
|
||||
INSTALL_DIR="/usr/local/bin"
|
||||
CONFIG_DIR="/etc/${APP_NAME}"
|
||||
CHURN_DISCOVERY="https://churn.prod.kjuulh.app"
|
||||
LOG="/var/log/churn-install.log"
|
||||
|
||||
# Colors for output
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
|
||||
exec > >(tee -i ${LOG})
|
||||
exec 2>&1
|
||||
echo "Starting churn install $(date)"
|
||||
|
||||
# Check if running as root
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
echo -e "${RED}Please run as root${NC}"
|
||||
@@ -75,12 +83,46 @@ Environment=RUST_LOG=h2=warn,hyper=warn,churn=debug,warn
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
|
||||
echo "Creating churn update service..."
|
||||
cat > "/etc/systemd/system/${SERVICE_UPDATE_NAME}" <<EOF
|
||||
[Unit]
|
||||
Description=Daily Churn Update Service
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/bin/bash -c 'curl -s https://git.front.kjuulh.io/kjuulh/churn-v2/raw/branch/main/install.sh | bash'
|
||||
User=root
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
|
||||
cat > "/etc/systemd/system/${TIMER_UPDATE_NAME}" <<EOF
|
||||
[Unit]
|
||||
Description=Run Churn Update Daily
|
||||
|
||||
[Timer]
|
||||
OnCalendar=daily
|
||||
Persistent=true
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
EOF
|
||||
|
||||
# Reload systemd and enable service
|
||||
echo "Configuring systemd service..."
|
||||
systemctl daemon-reload
|
||||
|
||||
systemctl enable "${SERVICE_NAME}"
|
||||
systemctl start "${SERVICE_NAME}"
|
||||
|
||||
systemctl enable "${SERVICE_UPDATE_NAME}"
|
||||
|
||||
systemctl enable "${TIMER_UPDATE_NAME}"
|
||||
systemctl start "${TIMER_UPDATE_NAME}"
|
||||
|
||||
# Check service status
|
||||
if systemctl is-active --quiet "${SERVICE_NAME}"; then
|
||||
echo -e "${GREEN}Installation successful! ${APP_NAME} is running.${NC}"
|
||||
|
Reference in New Issue
Block a user