From 65bea1640c1a63c643ea1ef28392d59670a1109e Mon Sep 17 00:00:00 2001 From: Alex Snaps Date: Thu, 15 Dec 2022 13:19:47 -0500 Subject: [PATCH] Preparing v1.0.0 release of server --- Cargo.lock | 2 +- limitador-server/CHANGELOG.md | 20 +++++++++++++++++++ limitador-server/Cargo.toml | 2 +- limitador-server/kubernetes/README.md | 2 +- .../kubernetes/limitador-deployment.yaml | 2 +- .../limitador-grafanadashboard.json | 4 ++-- limitador-server/src/main.rs | 2 +- limitador/src/storage/mod.rs | 2 +- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ff542bb1..744db9f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1209,7 +1209,7 @@ dependencies = [ [[package]] name = "limitador-server" -version = "1.0.0-rc1" +version = "1.1.0-dev" dependencies = [ "actix-rt", "actix-web", diff --git a/limitador-server/CHANGELOG.md b/limitador-server/CHANGELOG.md index f2bd5029..233c6a44 100644 --- a/limitador-server/CHANGELOG.md +++ b/limitador-server/CHANGELOG.md @@ -2,6 +2,26 @@ Notable changes to the Limitador server will be tracked in this document. +## 1.0.0 - 2022-12-15 + +### Added + +- Support for command line arguments and options +- Validation of the complete environment on start +- `LIMIT_FILE` is monitored for changes and hot-reloaded + +### Changed + +- [Syntax for condition](../doc/migrations/conditions.md) within `Limit`s changed +- Removed the HTTP endpoints to mutate `Limit`s +- `Limit`s are solely loaded from the `LIMIT_FILE` +- Only `Counter`s to `Limit`s are persisted, `Limit`s loaded from file are held in memory +- Duplicated `Limit`s with same namespace, conditions and variables is now impossible + +### Removed + +- By default, Infinispan support isn't compiled in. Use feature `infinispan` at build time + ## 0.5.1 - 2022-05-25 ### Changed diff --git a/limitador-server/Cargo.toml b/limitador-server/Cargo.toml index 55bdff22..b99e4849 100644 --- a/limitador-server/Cargo.toml +++ b/limitador-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "limitador-server" -version = "1.0.0-rc1" +version = "1.1.0-dev" authors = ["Alex Snaps ", "Eguzki Astiz Lezaun ", "David Ortiz "] license = "Apache-2.0" keywords = ["rate-limiting", "rate", "limiter", "envoy", "rls"] diff --git a/limitador-server/kubernetes/README.md b/limitador-server/kubernetes/README.md index 417397a0..2bcbaab7 100644 --- a/limitador-server/kubernetes/README.md +++ b/limitador-server/kubernetes/README.md @@ -116,7 +116,7 @@ kubectl apply -f limitador-podmonitor.yaml ``` ### Grafana dashboard -Then, if you have grafana deployed in the cluster, you can import a [3scale Limitador](limitador-grafanadashboard.json) grafana dashboard that we have prepared, which includes: +Then, if you have grafana deployed in the cluster, you can import a [Kuadrant Limitador](limitador-grafanadashboard.json) grafana dashboard that we have prepared, which includes: - Kuard envoyproxy sidecar metrics (globally and per pod) - Limitador metrics (globally and per pod) - And for every deployed component (limitador, kuard, redis): diff --git a/limitador-server/kubernetes/limitador-deployment.yaml b/limitador-server/kubernetes/limitador-deployment.yaml index 3d7b353c..0b236b66 100644 --- a/limitador-server/kubernetes/limitador-deployment.yaml +++ b/limitador-server/kubernetes/limitador-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: limitador - image: quay.io/3scale/limitador:0.5.1 + image: quay.io/kuadrant/limitador:latest imagePullPolicy: IfNotPresent env: - name: RUST_LOG diff --git a/limitador-server/kubernetes/limitador-grafanadashboard.json b/limitador-server/kubernetes/limitador-grafanadashboard.json index 67e4ef75..f0f3b9f1 100644 --- a/limitador-server/kubernetes/limitador-grafanadashboard.json +++ b/limitador-server/kubernetes/limitador-grafanadashboard.json @@ -2010,7 +2010,7 @@ "schemaVersion": 18, "style": "dark", "tags": [ - "3scale", + "kuadrant", "backend" ], "templating": { @@ -2149,6 +2149,6 @@ ] }, "timezone": "", - "title": "3scale Limitador", + "title": "Kuadrant Limitador", "version": 8 } \ No newline at end of file diff --git a/limitador-server/src/main.rs b/limitador-server/src/main.rs index 27df678e..17f491fd 100644 --- a/limitador-server/src/main.rs +++ b/limitador-server/src/main.rs @@ -159,7 +159,7 @@ impl Limiter { let parsed_url = Url::parse(&cfg.url).unwrap(); let mut builder = InfinispanStorageBuilder::new( - &format!( + format!( "{}://{}:{}", parsed_url.scheme(), parsed_url.host_str().unwrap(), diff --git a/limitador/src/storage/mod.rs b/limitador/src/storage/mod.rs index b6b91692..cc3fd3c0 100644 --- a/limitador/src/storage/mod.rs +++ b/limitador/src/storage/mod.rs @@ -37,7 +37,7 @@ impl Storage { pub fn new() -> Self { Self { limits: RwLock::new(HashMap::new()), - counters: Box::new(InMemoryStorage::default()), + counters: Box::::default(), } }