From aa77a08765e52fb4aec10c028027e04aa2fd7030 Mon Sep 17 00:00:00 2001 From: leone Date: Wed, 27 Dec 2023 17:51:16 +0100 Subject: [PATCH] chore: prepare v0.13-nightly (#769) * chore: prepare v0.13-nightly --- Cargo.lock | 21 +++++---- bin/nanocl/Cargo.toml | 54 ++++++++++++------------ bin/nanocl/changelog.md | 16 +++++++ bin/nanocl/version | 1 - bin/nanocld/Cargo.toml | 50 +++++++++++----------- bin/nanocld/changelog.md | 17 ++++++++ bin/nanocld/version | 1 - bin/ncdns/Cargo.toml | 34 +++++++-------- bin/ncdns/Dockerfile | 2 +- bin/ncdns/changelog.md | 11 +++++ bin/ncdns/version | 1 - bin/ncproxy/Cargo.toml | 42 +++++++++--------- bin/ncproxy/Dockerfile | 2 +- bin/ncproxy/changelog.md | 20 ++++++--- bin/ncproxy/version | 1 - bin/ncvpnkit/Cargo.toml | 22 +++++----- bin/ncvpnkit/Dockerfile | 2 +- bin/ncvpnkit/changelog.md | 6 +++ bin/ncvpnkit/version | 1 - bin/ndns/Cargo.toml | 3 ++ bin/ndns/changelog.md | 6 +++ bin/ndns/version | 1 - bin/nproxy/Cargo.toml | 3 ++ bin/nproxy/changelog.md | 6 +++ bin/nproxy/version | 1 - crates/nanocl_error/Cargo.toml | 14 +++--- crates/nanocl_stubs/Cargo.toml | 10 ++--- crates/nanocl_utils/Cargo.toml | 20 ++++----- crates/nanocld_client/Cargo.toml | 18 ++++---- crates/nanocld_client/src/http_client.rs | 2 +- examples/deploy_example.yml | 5 ++- installer.yml | 16 +++---- scripts/build_images.sh | 24 ++++++----- 33 files changed, 254 insertions(+), 179 deletions(-) delete mode 100644 bin/nanocl/version delete mode 100644 bin/nanocld/version delete mode 100644 bin/ncdns/version delete mode 100644 bin/ncproxy/version delete mode 100644 bin/ncvpnkit/version create mode 100644 bin/ndns/Cargo.toml delete mode 100644 bin/ndns/version create mode 100644 bin/nproxy/Cargo.toml delete mode 100644 bin/nproxy/version diff --git a/Cargo.lock b/Cargo.lock index 2507ac32c..edf36d0e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1867,7 +1867,7 @@ dependencies = [ [[package]] name = "nanocl" -version = "0.12.1" +version = "0.13.0" dependencies = [ "bollard-next", "chrono", @@ -1899,7 +1899,7 @@ dependencies = [ [[package]] name = "nanocl_error" -version = "0.1.1" +version = "0.2.0" dependencies = [ "bollard-next", "diesel", @@ -1912,7 +1912,7 @@ dependencies = [ [[package]] name = "nanocl_stubs" -version = "0.12.0" +version = "0.13.0" dependencies = [ "bollard-next", "chrono", @@ -1924,7 +1924,7 @@ dependencies = [ [[package]] name = "nanocl_utils" -version = "0.3.1" +version = "0.4.0" dependencies = [ "clap", "clap_mangen", @@ -1942,7 +1942,7 @@ dependencies = [ [[package]] name = "nanocld" -version = "0.12.1" +version = "0.13.0" dependencies = [ "bollard-next", "chrono", @@ -1978,7 +1978,7 @@ dependencies = [ [[package]] name = "nanocld_client" -version = "0.12.0" +version = "0.13.0" dependencies = [ "bollard-next", "futures", @@ -2002,7 +2002,7 @@ dependencies = [ [[package]] name = "ncdns" -version = "0.4.0" +version = "0.5.0" dependencies = [ "clap", "clap_mangen", @@ -2012,6 +2012,7 @@ dependencies = [ "nanocl_utils", "nanocld_client", "ntex", + "openssl", "serde", "serde_json", "serde_yaml", @@ -2021,7 +2022,7 @@ dependencies = [ [[package]] name = "ncproxy" -version = "0.9.0" +version = "0.10.0" dependencies = [ "bollard-next", "chrono", @@ -2035,6 +2036,7 @@ dependencies = [ "nanocld_client", "notify", "ntex", + "openssl", "serde", "serde_json", "serde_yaml", @@ -2044,7 +2046,7 @@ dependencies = [ [[package]] name = "ncvpnkit" -version = "0.2.0" +version = "0.3.0" dependencies = [ "futures-util", "log", @@ -2052,6 +2054,7 @@ dependencies = [ "nanocl_utils", "nanocld_client", "ntex", + "openssl", "serde_json", "vpnkitrc", ] diff --git a/bin/nanocl/Cargo.toml b/bin/nanocl/Cargo.toml index 26d3d46df..41574c418 100644 --- a/bin/nanocl/Cargo.toml +++ b/bin/nanocl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nanocl" -version = "0.12.1" +version = "0.13.0" edition = "2021" authors = ["nanocl contributors "] description = "The Self-Sufficient Hybrid-Cloud Orchestrator CLI" @@ -22,41 +22,41 @@ vendored = ["openssl/vendored"] test = [] [build-dependencies] -liquid = "0.26.1" -tabled = "0.15.0" +liquid = "0.26" +tabled = "0.15" clap_mangen = { version = "0.2" } -clap = { version = "4.4.11", features = ["derive"] } +clap = { version = "4.4", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } -chrono = { version = "0.4.31", default-features = false, features = [ +chrono = { version = "0.4", default-features = false, features = [ "std", "clock", ] } bollard-next = { version = "0.15.4" } -nanocl_utils = { version = "0.3.1", features = ["build_tools"] } -nanocld_client = { version = "0.12.0" } +nanocl_utils = { version = "0.4", features = ["build_tools"] } +nanocld_client = { version = "0.13" } [dependencies] bollard-next = { version = "0.15.4" } futures = "0.3" serde_yaml = "0.9" -tabled = "0.15.0" -indicatif = "0.17.7" -serde_json = "1.0.108" -ntex = { version = "0.7.16", features = ["tokio", "openssl"] } +tabled = "0.15" +indicatif = "0.17" +serde_json = "1.0" +ntex = { version = "0.7", features = ["tokio", "openssl"] } serde = { version = "1.0", features = ["derive"] } -clap = { version = "4.4.11", features = ["derive", "cargo"] } -tokio = { version = "1.34.0", features = ["fs"] } -tokio-util = "0.7.9" -chrono = { version = "0.4.31", default-features = false, features = [ +clap = { version = "4.4", features = ["derive", "cargo"] } +tokio = { version = "1.34", features = ["fs"] } +tokio-util = "0.7" +chrono = { version = "0.4", default-features = false, features = [ "std", "clock", ] } -dialoguer = "0.11.0" -termios = "0.3.3" -liquid = { version = "0.26.1", features = ["stdlib"] } -regex = "1.10.2" -nanocld_client = { version = "0.12.0", features = ["tokio"] } -nanocl_error = { version = "0.1.1", features = [ +dialoguer = "0.11" +termios = "0.3" +liquid = { version = "0.26", features = ["stdlib"] } +regex = "1.10" +nanocld_client = { version = "0.13", features = ["tokio"] } +nanocl_error = { version = "0.2", features = [ "io", "tokio", "http_client", @@ -64,10 +64,10 @@ nanocl_error = { version = "0.1.1", features = [ "bollard", "serde_yaml", ] } -nanocl_utils = { version = "0.3.1", features = ["unix"] } -ctrlc = "3.3.1" -toml = "0.8.8" -ring = "0.17.5" -nix = { version = "0.27.1", features = ["user"] } -dotenvy = "0.15.7" +nanocl_utils = { version = "0.4", features = ["unix"] } +ctrlc = "3.3" +toml = "0.8" +ring = "0.17" +nix = { version = "0.27", features = ["user"] } +dotenvy = "0.15" openssl = "0.10" diff --git a/bin/nanocl/changelog.md b/bin/nanocl/changelog.md index 0fd7ed342..a4726c435 100644 --- a/bin/nanocl/changelog.md +++ b/bin/nanocl/changelog.md @@ -5,6 +5,22 @@ 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). +## [0.13.0] + +### Changed + +- State apply and remove with new loader and logic. +- Install and uninstall with new loader and logic. +- Use of nanocld_client 0.13.0 + +### Added + +- PS command with filter by kind, namespace, limit and offset. + +### Fixed + +- Fixed missing openssl + ## [0.12.0] 2023-12-22 ### Added diff --git a/bin/nanocl/version b/bin/nanocl/version deleted file mode 100644 index 34a83616b..000000000 --- a/bin/nanocl/version +++ /dev/null @@ -1 +0,0 @@ -0.12.1 diff --git a/bin/nanocld/Cargo.toml b/bin/nanocld/Cargo.toml index 0154630b4..9941bf9d8 100644 --- a/bin/nanocld/Cargo.toml +++ b/bin/nanocld/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nanocld" -version = "0.12.1" +version = "0.13.0" edition = "2021" authors = ["nanocl contributors "] description = "The Self-Sufficient Hybrid-Cloud Orchestrator Daemon" @@ -29,15 +29,15 @@ test = ["nanocl_utils/ntex_test_client", "nanocl_stubs/test"] release = [] [build-dependencies] -clap = { version = "4.4.11", features = ["derive"] } +clap = { version = "4.4", features = ["derive"] } clap_mangen = { version = "0.2" } -nanocl_utils = { version = "0.3.1", features = ["build_tools"] } +nanocl_utils = { version = "0.4", features = ["build_tools"] } [dev-dependencies] serde_yaml = "0.9" [dependencies] -nanocl_error = { version = "0.1.1", features = [ +nanocl_error = { version = "0.2", features = [ "io", "http", "http_client", @@ -48,40 +48,40 @@ nanocl_error = { version = "0.1.1", features = [ "tokio", ] } bollard-next = { version = "0.15.4" } -log = "0.4.20" +log = "0.4" futures = "0.3" serde_yaml = "0.9" env_logger = { version = "0.10" } -serde_json = "1.0.108" -diesel_migrations = "2.0.0" -clap = { version = "4.4.11", features = ["derive"] } +serde_json = "1.0" +diesel_migrations = "2.0" +clap = { version = "4.4", features = ["derive"] } url = { version = "2", features = ["serde"] } -serde = { version = "1.0.192", features = ["derive"] } +serde = { version = "1.0", features = ["derive"] } uuid = { version = "1.6", features = ["serde", "v4"] } -ntex = { version = "0.7.16", features = ["tokio", "openssl"] } -diesel = { version = "2.1.2", features = [ +ntex = { version = "0.7", features = ["tokio", "openssl"] } +diesel = { version = "2.1", features = [ "postgres", "r2d2", "chrono", "uuid", "serde_json", ] } -tokio = { version = "1.34.0", features = ["fs", "process", "io-std"] } -hyper = "0.14.27" -tokio-util = "0.7.9" -futures-util = "0.3.26" -libc = "0.2.139" -chrono = { version = "0.4.31", default-features = false, features = [ +tokio = { version = "1.34", features = ["fs", "process", "io-std"] } +hyper = "0.14" +tokio-util = "0.7" +futures-util = "0.3" +libc = "0.2" +chrono = { version = "0.4", default-features = false, features = [ "std", "clock", "serde", ] } -jsonschema = { version = "0.17.0", default-features = false } -nanocld_client = { version = "0.12.0", features = ["tokio"] } -metrsd_client = "0.4.1" -nanocl_stubs = { version = "0.12.0", features = ["serde"] } -nanocl_utils = { version = "0.3.1", features = ["unix", "ntex", "logger"] } +jsonschema = { version = "0.17", default-features = false } +nanocld_client = { version = "0.13", features = ["tokio"] } +metrsd_client = "0.4" +nanocl_stubs = { version = "0.13", features = ["serde"] } +nanocl_utils = { version = "0.4", features = ["unix", "ntex", "logger"] } utoipa = { version = "4.1", features = ["yaml"], optional = true } -notify = "6.1.1" -ntex-cors = "0.4.0" -rand = "0.8.5" +notify = "6.1" +ntex-cors = "0.4" +rand = "0.8" diff --git a/bin/nanocld/changelog.md b/bin/nanocld/changelog.md index d6ad64c3e..5d91ad497 100644 --- a/bin/nanocld/changelog.md +++ b/bin/nanocld/changelog.md @@ -5,6 +5,23 @@ 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). +## [0.13.0] + +### Changed + +- Removed state apply and remove endpoints. + +### Fixed + +- Secret creation when using native kind. +- Resource kind was saved with it's version. +- Openssl linking. + +### Added + +- Processes with generic filter from the endpoint. + + ## [0.12.0] - 2023-12-22 ### Added diff --git a/bin/nanocld/version b/bin/nanocld/version deleted file mode 100644 index 34a83616b..000000000 --- a/bin/nanocld/version +++ /dev/null @@ -1 +0,0 @@ -0.12.1 diff --git a/bin/ncdns/Cargo.toml b/bin/ncdns/Cargo.toml index c9e309a46..e89223993 100644 --- a/bin/ncdns/Cargo.toml +++ b/bin/ncdns/Cargo.toml @@ -1,7 +1,7 @@ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package] name = "ncdns" -version = "0.4.0" +version = "0.5.0" edition = "2021" [[bin]] @@ -19,28 +19,26 @@ dev = [ "nanocl_utils/ntex_test_client", ] test = ["nanocl_utils/ntex_test_client"] +vendored = ["openssl/vendored"] [build-dependencies] -clap = { version = "4.4.11", features = ["derive"] } +clap = { version = "4.4", features = ["derive"] } clap_mangen = { version = "0.2" } -nanocl_utils = { version = "0.3.1", features = ["build_tools"] } +nanocl_utils = { version = "0.4", features = ["build_tools"] } [dev-dependencies] -serde_yaml = "0.9.25" +serde_yaml = "0.9" [dependencies] -log = "0.4.20" -clap = { version = "4.4.11", features = ["derive"] } -ntex = { version = "0.7.16", features = ["tokio"] } -tokio = { version = "1.34.0", features = ["fs"] } -futures = "0.3.26" -serde = { version = "1.0.192", features = ["derive"] } -serde_json = "1.0.108" -nanocld_client = { version = "0.12.0", features = ["tokio"] } -nanocl_error = { version = "0.1.1", features = ["io", "http", "http_client"] } -nanocl_utils = { version = "0.3.1", features = [ - "ntex", - "logger", - "versioning", -] } +log = "0.4" +clap = { version = "4.4", features = ["derive"] } +ntex = { version = "0.7", features = ["tokio", "openssl"] } +tokio = { version = "1.34", features = ["fs"] } +futures = "0.3" +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +nanocld_client = { version = "0.13", features = ["tokio"] } +nanocl_error = { version = "0.2", features = ["io", "http", "http_client"] } +nanocl_utils = { version = "0.4", features = ["ntex", "logger", "versioning"] } utoipa = { version = "4.1", features = ["yaml"], optional = true } +openssl = "0.10" diff --git a/bin/ncdns/Dockerfile b/bin/ncdns/Dockerfile index 9570cb408..1b2413312 100644 --- a/bin/ncdns/Dockerfile +++ b/bin/ncdns/Dockerfile @@ -45,7 +45,7 @@ COPY .git ./.git ENV NANOCL_CHANNEL=$channel ENV RUSTFLAGS="-C target-feature=+crt-static" RUN export ARCH=$(uname -m) \ - && cargo build --release --target=$ARCH-unknown-linux-musl --features release --bin ncdns + && cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncdns RUN export ARCH=$(uname -m) \ && cp /app/target/$ARCH-unknown-linux-musl/release/ncdns /bin/ncdns diff --git a/bin/ncdns/changelog.md b/bin/ncdns/changelog.md index 36898e0e8..9c0eaf288 100644 --- a/bin/ncdns/changelog.md +++ b/bin/ncdns/changelog.md @@ -5,6 +5,17 @@ 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). +## [0.5.0] + +### Changed + +- state-dir option to match with ndns +- Use of nanocld_client 0.13.0 + +### Fixed + +- Openssl linking. + ## [0.4.0] - 2023-12-22 ### Fixed diff --git a/bin/ncdns/version b/bin/ncdns/version deleted file mode 100644 index 1d0ba9ea1..000000000 --- a/bin/ncdns/version +++ /dev/null @@ -1 +0,0 @@ -0.4.0 diff --git a/bin/ncproxy/Cargo.toml b/bin/ncproxy/Cargo.toml index 1e9d7bf5c..4ac98879c 100644 --- a/bin/ncproxy/Cargo.toml +++ b/bin/ncproxy/Cargo.toml @@ -1,7 +1,7 @@ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package] name = "ncproxy" -version = "0.9.0" +version = "0.10.0" edition = "2021" authors = ["nanocl contributors "] description = "Official nanocl controller daemon proxy" @@ -25,44 +25,42 @@ dev = [ "nanocl_utils/ntex_test_client", ] test = ["nanocl_utils/ntex_test_client"] +vendored = ["openssl/vendored"] [build-dependencies] -clap = { version = "4.4.11", features = ["derive"] } +clap = { version = "4.4", features = ["derive"] } clap_mangen = { version = "0.2" } -nanocl_utils = { version = "0.3.1", features = ["build_tools"] } +nanocl_utils = { version = "0.4", features = ["build_tools"] } [dev-dependencies] -serde_yaml = "0.9.25" -bollard-next = "0.15.4" +serde_yaml = "0.9" +bollard-next = "0.15" [dependencies] -log = "0.4.20" -liquid = "0.26.1" -clap = { version = "4.4.11", features = ["derive"] } -ntex = { version = "0.7.16", features = ["tokio"] } -tokio = { version = "1.34.0", features = ["fs"] } -serde = "1.0.192" -serde_json = "1.0.108" -futures = "0.3.25" -notify = { version = "6.1.1", default-features = false, features = [ +log = "0.4" +liquid = "0.26" +clap = { version = "4.4", features = ["derive"] } +ntex = { version = "0.7", features = ["tokio"] } +tokio = { version = "1.34", features = ["fs"] } +serde = "1.0" +serde_json = "1.0" +futures = "0.3" +notify = { version = "6.1", default-features = false, features = [ "macos_kqueue", ] } -nanocld_client = { version = "0.12.0", features = ["tokio"] } -nanocl_error = { version = "0.1.1", features = [ +nanocld_client = { version = "0.13", features = ["tokio"] } +nanocl_error = { version = "0.2", features = [ "io", "ntex", "http", "http_client", "serde_json", ] } -nanocl_utils = { version = "0.3.1", features = [ - "ntex", - "logger", - "versioning", -] } +nanocl_utils = { version = "0.4", features = ["ntex", "logger", "versioning"] } utoipa = { version = "4.1", features = ["yaml"], optional = true } -chrono = { version = "0.4.31", default-features = false, features = [ +chrono = { version = "0.4", default-features = false, features = [ "std", "clock", "serde", ] } +openssl = "0.10" diff --git a/bin/ncproxy/Dockerfile b/bin/ncproxy/Dockerfile index 095e59f6b..405ba5daa 100644 --- a/bin/ncproxy/Dockerfile +++ b/bin/ncproxy/Dockerfile @@ -45,7 +45,7 @@ COPY .git ./.git ENV NANOCL_CHANNEL=$channel ENV RUSTFLAGS="-C target-feature=+crt-static" RUN export ARCH=$(uname -m) \ - && cargo build --release --target=$ARCH-unknown-linux-musl --features release --bin ncproxy + && cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncproxy RUN export ARCH=$(uname -m) \ && cp /app/target/$ARCH-unknown-linux-musl/release/ncproxy /bin/ncproxy diff --git a/bin/ncproxy/changelog.md b/bin/ncproxy/changelog.md index bb87705d9..5a7b7c31b 100644 --- a/bin/ncproxy/changelog.md +++ b/bin/ncproxy/changelog.md @@ -5,15 +5,23 @@ 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). -## untagged +## [0.10.0] ### Changed -- Added state dir -- Reload task that can be canceled -- Test file generation before creating the resource -- Self manage nginx process -- Metrics saving +- state-dir option to match with nproxy. +- Use of nanocld_client 0.13.0. +- Use of template system for config file generation. + +### Added + +- Metrics saving for http and stream. +- Reload task that can be canceled to avoid burst from large Statefile. +- Test file generation on creation and heal config if test fail. + +### Fixed + +- Openssl linking. ## [0.9.0] - 2023-12-22 diff --git a/bin/ncproxy/version b/bin/ncproxy/version deleted file mode 100644 index f374f6662..000000000 --- a/bin/ncproxy/version +++ /dev/null @@ -1 +0,0 @@ -0.9.1 diff --git a/bin/ncvpnkit/Cargo.toml b/bin/ncvpnkit/Cargo.toml index a5a055e27..b7deed2f9 100644 --- a/bin/ncvpnkit/Cargo.toml +++ b/bin/ncvpnkit/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ncvpnkit" -version = "0.2.0" +version = "0.3.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -8,20 +8,22 @@ edition = "2021" [features] dev = ["nanocl_utils/dev"] test = [] +vendored = ["openssl/vendored"] [build-dependencies] -nanocl_utils = { version = "0.3.1", features = ["build_tools"] } +nanocl_utils = { version = "0.4", features = ["build_tools"] } [dependencies] -log = "0.4.20" -futures-util = "0.3.28" -ntex = { version = "0.7.16", features = ["tokio"] } -vpnkitrc = { version = "0.1.2", features = ["tokio"] } -nanocld_client = { version = "0.12.0" } -nanocl_utils = { version = "0.3.1", features = ["logger"] } -serde_json = "1.0.108" -nanocl_error = { version = "0.1.1", features = [ +log = "0.4" +futures-util = "0.3" +ntex = { version = "0.7", features = ["tokio"] } +vpnkitrc = { version = "0.1", features = ["tokio"] } +nanocld_client = { version = "0.13" } +nanocl_utils = { version = "0.4", features = ["logger"] } +serde_json = "1.0" +nanocl_error = { version = "0.2", features = [ "io", "http_client", "serde_json", ] } +openssl = "0.10" diff --git a/bin/ncvpnkit/Dockerfile b/bin/ncvpnkit/Dockerfile index 01d235f83..a3251dc40 100644 --- a/bin/ncvpnkit/Dockerfile +++ b/bin/ncvpnkit/Dockerfile @@ -45,7 +45,7 @@ COPY .git ./.git ENV NANOCL_CHANNEL=$channel ENV RUSTFLAGS="-C target-feature=+crt-static" RUN export ARCH=$(uname -m) \ - && cargo build --release --target=$ARCH-unknown-linux-musl --features release --bin ncvpnkit + && cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncvpnkit RUN export ARCH=$(uname -m) \ && cp /app/target/$ARCH-unknown-linux-musl/release/ncvpnkit /bin/ncvpnkit diff --git a/bin/ncvpnkit/changelog.md b/bin/ncvpnkit/changelog.md index ed9890b4e..8df0e0ac2 100644 --- a/bin/ncvpnkit/changelog.md +++ b/bin/ncvpnkit/changelog.md @@ -5,6 +5,12 @@ 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). +## [0.13.0] + +### Changed + +- Use of nanocld_client 0.13.0 + ## [0.2.0] - 2023-12-22 ### Changed diff --git a/bin/ncvpnkit/version b/bin/ncvpnkit/version deleted file mode 100644 index 0ea3a944b..000000000 --- a/bin/ncvpnkit/version +++ /dev/null @@ -1 +0,0 @@ -0.2.0 diff --git a/bin/ndns/Cargo.toml b/bin/ndns/Cargo.toml new file mode 100644 index 000000000..28a9020b8 --- /dev/null +++ b/bin/ndns/Cargo.toml @@ -0,0 +1,3 @@ +[package] +name = "ndns" +version = "2.89.0-n0.5" diff --git a/bin/ndns/changelog.md b/bin/ndns/changelog.md index dd80966b6..cbcb28bb5 100644 --- a/bin/ndns/changelog.md +++ b/bin/ndns/changelog.md @@ -5,6 +5,12 @@ 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). +## [2.89.0-n0.5] + +### Added + +- STATE_DIR env variable to set the state directory to match with ncdns + ## [2.89.0.3] - 2023-12-22 ### Fixed diff --git a/bin/ndns/version b/bin/ndns/version deleted file mode 100644 index 2034960db..000000000 --- a/bin/ndns/version +++ /dev/null @@ -1 +0,0 @@ -2.89.0.3 diff --git a/bin/nproxy/Cargo.toml b/bin/nproxy/Cargo.toml new file mode 100644 index 000000000..1f88ab805 --- /dev/null +++ b/bin/nproxy/Cargo.toml @@ -0,0 +1,3 @@ +[package] +name = "ndns" +version = "1.25.0-n0.10" diff --git a/bin/nproxy/changelog.md b/bin/nproxy/changelog.md index c9810d1e8..67821130f 100644 --- a/bin/nproxy/changelog.md +++ b/bin/nproxy/changelog.md @@ -5,6 +5,12 @@ 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). +## [1.25.0-n0.10] + +### Added + +- STATE_DIR env variable to set the state directory to match with ncproxy + ## [1.25.0.3] - 2023-12-22 ### Changed diff --git a/bin/nproxy/version b/bin/nproxy/version deleted file mode 100644 index e9074dd04..000000000 --- a/bin/nproxy/version +++ /dev/null @@ -1 +0,0 @@ -1.25.0.4 diff --git a/crates/nanocl_error/Cargo.toml b/crates/nanocl_error/Cargo.toml index 5e258e235..2951f6523 100644 --- a/crates/nanocl_error/Cargo.toml +++ b/crates/nanocl_error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nanocl_error" -version = "0.1.1" +version = "0.2.0" edition = "2021" authors = ["nanocl contributors "] description = "Nanocl error types" @@ -25,10 +25,10 @@ serde_urlencoded = ["dep:serde_urlencoded"] tokio = ["dep:tokio"] [dependencies] -ntex = { version = "0.7.16", optional = true } -serde_json = { version = "1.0.108", optional = true } -serde_urlencoded = { version = "0.7.1", optional = true } -diesel = { version = "2.1.2", default-features = false, optional = true } -bollard-next = { version = "0.15.4", optional = true } +ntex = { version = "0.7", optional = true } +serde_json = { version = "1.0", optional = true } +serde_urlencoded = { version = "0.7", optional = true } +diesel = { version = "2.1", default-features = false, optional = true } +bollard-next = { version = "0.15", optional = true } serde_yaml = { version = "0.9", optional = true } -tokio = { version = "1.34.0", default-features = false, optional = true } +tokio = { version = "1.34", default-features = false, optional = true } diff --git a/crates/nanocl_stubs/Cargo.toml b/crates/nanocl_stubs/Cargo.toml index 020a8c3d9..7d078df0c 100644 --- a/crates/nanocl_stubs/Cargo.toml +++ b/crates/nanocl_stubs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nanocl_stubs" -version = "0.12.0" +version = "0.13.0" edition = "2021" authors = ["nanocl contributors "] description = "Nanocl shared data model" @@ -19,12 +19,12 @@ utoipa = ["dep:utoipa"] test = [] [dependencies] -uuid = { version = "1.6.1" } -serde_json = "1.0.108" +uuid = { version = "1.6" } +serde_json = "1.0" bollard-next = { version = "0.15.4" } -chrono = { version = "0.4.31", default-features = false, features = [ +chrono = { version = "0.4", default-features = false, features = [ "std", "clock", ] } -serde = { version = "1.0.192", features = ["derive"], optional = true } +serde = { version = "1.0", features = ["derive"], optional = true } utoipa = { version = "4", features = ["uuid", "chrono"], optional = true } diff --git a/crates/nanocl_utils/Cargo.toml b/crates/nanocl_utils/Cargo.toml index 711f2dd2a..e05326169 100644 --- a/crates/nanocl_utils/Cargo.toml +++ b/crates/nanocl_utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nanocl_utils" -version = "0.3.1" +version = "0.4.0" edition = "2021" authors = ["nanocl contributors "] description = "Nanocl shared utils" @@ -29,15 +29,15 @@ build_tools = ["dep:clap", "dep:clap_mangen"] ntex_test_client = ["dep:ntex", "dep:serde"] [dependencies] -ntex = { version = "0.7.16", optional = true } -log = { version = "0.4.20", optional = true } -env_logger = { version = "0.10.1", optional = true } -serde = { version = "1.0.192", features = ["derive"], optional = true } -serde_json = { version = "1.0.108", optional = true } -futures = { version = "0.3.25", optional = true } +ntex = { version = "0.7", optional = true } +log = { version = "0.4", optional = true } +env_logger = { version = "0.10", optional = true } +serde = { version = "1.0", features = ["derive"], optional = true } +serde_json = { version = "1.0", optional = true } +futures = { version = "0.3", optional = true } utoipa = { version = "4.1", features = ["yaml"], optional = true } utoipa-swagger-ui = { version = "5.0", optional = true } -libc = { version = "0.2.139", optional = true } -clap = { version = "4.4.11", features = ["derive", "cargo"], optional = true } +libc = { version = "0.2", optional = true } +clap = { version = "4.4", features = ["derive", "cargo"], optional = true } clap_mangen = { version = "0.2", optional = true } -nanocl_error = { version = "0.1.1", optional = true } +nanocl_error = { version = "0.2", optional = true } diff --git a/crates/nanocld_client/Cargo.toml b/crates/nanocld_client/Cargo.toml index 496f68ef0..94c6fac36 100644 --- a/crates/nanocld_client/Cargo.toml +++ b/crates/nanocld_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nanocld_client" -version = "0.12.0" +version = "0.13.0" edition = "2021" authors = ["nanocl contributors "] description = "The Nanocl daemon api client" @@ -20,14 +20,14 @@ async-std = ["ntex/async-std"] utoipa = ["nanocl_stubs/utoipa"] [dev-dependencies] -tokio-util = "0.7.9" -tokio = { version = "1.34.0", features = ["fs"] } +tokio-util = "0.7" +tokio = { version = "1.34", features = ["fs"] } [dependencies] -futures = "0.3.25" -serde_json = "1.0.108" -ntex = { version = "0.7.16" } -serde = { version = "1.0.192", features = ["derive"] } +futures = "0.3" +serde_json = "1.0" +ntex = { version = "0.7" } +serde = { version = "1.0", features = ["derive"] } bollard-next = { version = "0.15.4" } -nanocl_stubs = { version = "0.12.0", features = ["serde"] } -nanocl_error = { version = "0.1.1", features = ["io", "http_client"] } +nanocl_stubs = { version = "0.13", features = ["serde"] } +nanocl_error = { version = "0.2", features = ["io", "http_client"] } diff --git a/crates/nanocld_client/src/http_client.rs b/crates/nanocld_client/src/http_client.rs index 890044594..a79ecd1f5 100644 --- a/crates/nanocld_client/src/http_client.rs +++ b/crates/nanocld_client/src/http_client.rs @@ -13,7 +13,7 @@ use nanocl_error::http_client::HttpClientError; use crate::error::is_api_error; -pub const NANOCLD_DEFAULT_VERSION: &str = "0.12.0"; +pub const NANOCLD_DEFAULT_VERSION: &str = "0.13.0"; #[derive(Clone)] pub struct NanocldClient { diff --git a/examples/deploy_example.yml b/examples/deploy_example.yml index 32025a871..7ede6d454 100644 --- a/examples/deploy_example.yml +++ b/examples/deploy_example.yml @@ -13,7 +13,7 @@ Secrets: # https://docs.next-hat.com/references/nanocl/resource Resources: - Name: deploy-example.com - Kind: ncproxy.io/rule/v0.9 + Kind: ncproxy.io/rule Metadata: CertManager: certbot Selector: @@ -37,7 +37,7 @@ Resources: Port: 9000 - Name: proxy-get-started - Kind: ncproxy.io/rule/v0.9 + Kind: ncproxy.io/rule Data: Rules: - Domain: get-started.com @@ -61,6 +61,7 @@ Cargoes: Image: ghcr.io/next-hat/nanocl-get-started:latest Env: - APP=GET_STARTED + - NEW=GG - Name: deploy-example2 Container: diff --git a/installer.yml b/installer.yml index 84ad82601..f759d8cd6 100644 --- a/installer.yml +++ b/installer.yml @@ -53,7 +53,7 @@ Cargoes: - Name: nproxy Container: # {% if channel == "nightly" %} - Image: ghcr.io/next-hat/nproxy:1.25.0.4-nightly + Image: ghcr.io/next-hat/nproxy:1.25.0-n0.10-nightly # {% else %} Image: ghcr.io/next-hat/nproxy:1.25.0.3 # {% endif %} @@ -74,7 +74,7 @@ Cargoes: - Name: ncproxy Container: # {% if channel == "nightly" %} - Image: ghcr.io/next-hat/ncproxy:0.9.1-nightly + Image: ghcr.io/next-hat/ncproxy:0.10.0-nightly # {% else %} Image: ghcr.io/next-hat/ncproxy:0.9.0 # {% endif %} @@ -95,7 +95,7 @@ Cargoes: - Name: ndns Container: # {% if channel == "nightly" %} - Image: ghcr.io/next-hat/ndns:2.89.0.3-nightly + Image: ghcr.io/next-hat/ndns:2.89.0-n0.5-nightly # {% else %} Image: ghcr.io/next-hat/ndns:2.89.0.3 # {% endif %} @@ -109,14 +109,14 @@ Cargoes: - Name: ncdns Container: # {% if channel == "nightly" %} - Image: ghcr.io/next-hat/ncdns:0.4.0-nightly + Image: ghcr.io/next-hat/ncdns:0.5.0-nightly # {% else %} Image: ghcr.io/next-hat/ncdns:0.4.0 # {% endif %} Tty: true Cmd: - - --conf-dir - - /opt/dns + - --state-dir + - ${{ state_dir }}/dns - --dns - 1.1.1.1 - --dns @@ -134,7 +134,7 @@ Cargoes: - Name: ndaemon Container: # {% if channel == "nightly" %} - Image: ghcr.io/next-hat/nanocld:0.12.1-nightly + Image: ghcr.io/next-hat/nanocld:0.13.0-nightly # {% else %} Image: ghcr.io/next-hat/nanocld:0.12.0 # {% endif %} @@ -176,7 +176,7 @@ Cargoes: - Name: ncvpnkit Container: # {% if channel == "nightly" %} - Image: ghcr.io/next-hat/ncvpnkit:0.2.0-nightly + Image: ghcr.io/next-hat/ncvpnkit:0.3.0-nightly # {% else %} Image: ghcr.io/next-hat/ncvpnkit:0.2.0 # {% endif %} diff --git a/scripts/build_images.sh b/scripts/build_images.sh index 6957429f0..1f0364867 100755 --- a/scripts/build_images.sh +++ b/scripts/build_images.sh @@ -1,19 +1,23 @@ #!/bin/sh ## name: build_images.sh -BUILDER=buildx-multi-arch +# Buildx local command +# BUILDER=buildx-multi-arch +# docker buildx inspect $BUILDER || docker buildx create --name=$BUILDER --driver=docker-container --driver-opt=network=host +# docker buildx build --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --tag="ghcr.io/next-hat/$name:$version" -f $project/Dockerfile . -docker buildx inspect $BUILDER || docker buildx create --name=$BUILDER --driver=docker-container --driver-opt=network=host +REPO=ghcr.io/next-hat for project in ./bin/*; do + ## Extract name from path name=$(basename "${project}") - version=$(cat $project/version) - # if [ "$name" != "nanocld" ]; then - # continue - # fi - echo "Building ${name}:${version}" + ## Skip the cli + if [ "$name" = "nanocl" ]; then + continue + fi + ## Extract version from Cargo.toml + version=$(grep -m1 version $project/Cargo.toml | sed -e 's/version = //g' | sed -e 's/"//g') + TAG="$REPO/$name:$version-nightly" + echo $TAG docker build -t "ghcr.io/next-hat/$name:$version-nightly" -f $project/Dockerfile . - # docker buildx build --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --tag="ghcr.io/next-hat/$name:$version" -f $project/Dockerfile . done - -echo "Done!"