From 866ae445c3e90578797f7a9ec8e11aa58be69436 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Wed, 11 Dec 2024 19:34:25 +0530 Subject: [PATCH 01/29] Update README --- README.md | 61 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 1531b6c..7969b1f 100644 --- a/README.md +++ b/README.md @@ -5,16 +5,15 @@ # Content Cache Operator -A Juju charm for deploying and managing a content cache. +A [Juju](https://juju.is/) [charm](https://juju.is/docs/olm/charmed-operators) deploying and managing service for caching content on Kubernetes, built on top of [Nginx](https://www.nginx.com/), configurable to cache any http or https web site and useful for building Content Delivery Networks (CDN). -## Overview - -A service for caching content, built on top of [Nginx](https://www.nginx.com/), -configurable to cache any http or https web site. Tuning options include -cache storage size, maximum request size to cache and cache validity duration. +Like any Juju charm, this charm supports one-line deployment, configuration, integration, scaling, and more. For Charmed Content Cache, this includes: +* scaling the number of cache instances +* cache configuration changes +* deployment on many different Kubernetes platforms, from MicroK8s to Charmed Kubernetes and public cloud Kubernetes offerings This service was developed to provide front-end caching for web sites run by -Canonical's IS team, and to reduce the need for third-party CDNs by providing +Canonical's IS (Infrastructure Services) team, and to reduce the need for third-party CDNs by providing high-bandwidth access to web sites via this caching front-end. Currently used for a number of services including [the Snap Store](https://snapcraft.io/store), the majority of Canonical's web properties including [ubuntu.com](https://ubuntu.com) and @@ -24,17 +23,51 @@ This Kubernetes-based version is built using the same approach as the [machine c a situation where your Kubernetes cluster and its ingress controllers have a fast connection to the Internet. +For information about how to deploy, integrate, and manage this charm, see the Official [Content Cache Documentation](https://charmhub.io/content-cache-k8s/docs). + +## Get Started + +To begin, refer to the [Getting Started](https://charmhub.io/content-cache-k8s/docs/tutorial-getting-started) tutorial for step-by-step instructions. + +### Basic Operations + +The following actions are available for the charm: +- report-visits-by-ip + +Tuning options include: +- cache storage size +- maximum request size to cache +- cache validity duration + +You can find more information about supported actions in [the Charmhub documentation](https://charmhub.io/content-cache-k8s/actions). + +## Integrations + +Since Content-cache is meant to serve as cache for another charm, you can use Hello-kubecon as an example: + +``` +juju deploy content-cache-k8s +juju deploy hello-kubecon +juju relate content-cache-k8s:ingress-proxy hello-kubecon +``` + +Apart from this integration, the charm can be integrated with other Juju charms and services as well. You can find the full list of integrations in [the Charmhub documentation](https://charmhub.io/content-cache-k8s/integrations). + + +## Learn more + +- [Read more](https://charmhub.io/content-cache-k8s/docs) +- [Developer documentation](https://nginx.org/en/docs/dev/development_guide.html) +- [Official webpage](https://www.nginx.com/) +- [Troubleshooting](https://matrix.to/#/#charmhub-charmdev:ubuntu.com) + + ## Project and community -The Content-cache-k8s Operator is a member of the Ubuntu family. It's an +The Content-cache-k8s Operator is a member of the Ubuntu family. It is an open source project that warmly welcomes community projects, contributions, suggestions, fixes and constructive feedback. * [Code of conduct](https://ubuntu.com/community/code-of-conduct) * [Get support](https://discourse.charmhub.io/) -* [Join our online chat](https://chat.charmhub.io/charmhub/channels/charm-dev) * [Contribute](https://charmhub.io/content-cache-k8s/docs/how-to-guides-contributing) -Thinking about using the Content-cache-k8s for your next project? [Get in touch](https://chat.charmhub.io/charmhub/channels/charm-dev)! - ---- - -For further details, [see the charm's detailed documentation](https://charmhub.io/content-cache-k8s/docs) +* [Matrix](https://matrix.to/#/#charmhub-charmdev:ubuntu.com) From d3f403d0fb5ff224128cf53bd3eccf473a229f95 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 10:32:32 +0530 Subject: [PATCH 02/29] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7969b1f..9f75d15 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ For information about how to deploy, integrate, and manage this charm, see the O ## Get Started -To begin, refer to the [Getting Started](https://charmhub.io/content-cache-k8s/docs/tutorial-getting-started) tutorial for step-by-step instructions. +To begin, refer to the [Content Cache tutorial](https://charmhub.io/content-cache-k8s/docs/tutorial-getting-started) for step-by-step instructions. ### Basic Operations @@ -43,7 +43,7 @@ You can find more information about supported actions in [the Charmhub documenta ## Integrations -Since Content-cache is meant to serve as cache for another charm, you can use Hello-kubecon as an example: +Content-cache is meant to serve as cache for another charm. You can use Hello-kubecon as an example: ``` juju deploy content-cache-k8s From 5ed294ed84870aff537f0a097a8327d168b89a8c Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 11:01:21 +0530 Subject: [PATCH 03/29] Update cosl --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9684eab..67dcf43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -cosl +cosl==0.0.45 ops>=1.2.0 tabulate From 8b32b260290e0b2bb654e1fb8f271b7ebae0533c Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 11:16:11 +0530 Subject: [PATCH 04/29] Update cosl --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 67dcf43..a9957ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -cosl==0.0.45 +cosl==0.0.46 ops>=1.2.0 tabulate From 46f5cfb3aa4e8b672dfaea49dfe7543abe592f8c Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 11:35:32 +0530 Subject: [PATCH 05/29] Update ops --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index a9957ca..a067a7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -cosl==0.0.46 -ops>=1.2.0 +cosl==0.0.45 +ops>=2.8 tabulate From 76428936ed1f3ee7e7667058884a29c2a2ce7d5b Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 11:47:58 +0530 Subject: [PATCH 06/29] Update ops --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index a067a7e..17e0d57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +pydantic ==1.10.19 cosl==0.0.45 ops>=2.8 tabulate From 312010f3d3ca8be5ba4d35f9bfd5a568b27d73a1 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 11:58:55 +0530 Subject: [PATCH 07/29] Update charmcraft --- charmcraft.yaml | 10 ++++++++++ requirements.txt | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charmcraft.yaml b/charmcraft.yaml index 4c562bf..b19c42c 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -13,3 +13,13 @@ parts: charm: prime: - content-cache_rock/nginx_cfg.tmpl + build-snaps: + - rustup + override-build: | + rustup default stable + craftctl default + build-packages: + - libffi-dev + - libssl-dev + - pkg-config + diff --git a/requirements.txt b/requirements.txt index 17e0d57..9684eab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -pydantic ==1.10.19 -cosl==0.0.45 -ops>=2.8 +cosl +ops>=1.2.0 tabulate From dee2b29f0838d130b7443e98350ccb5b656709a0 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 12:25:45 +0530 Subject: [PATCH 08/29] Update trivy --- .trivyignore | 25 +++++++++++++++++++++++++ tox.ini | 1 + 2 files changed, 26 insertions(+) create mode 100644 .trivyignore diff --git a/.trivyignore b/.trivyignore new file mode 100644 index 0000000..817dd5e --- /dev/null +++ b/.trivyignore @@ -0,0 +1,25 @@ +CVE-2023-24538 +CVE-2023-24540 +CVE-2024-24790 +CVE-2022-27664 +CVE-2022-2879 +CVE-2022-2880 +CVE-2022-32190 +CVE-2022-41715 +CVE-2022-41716 +CVE-2022-41720 +CVE-2022-41722 +CVE-2022-41723 +CVE-2022-41724 +CVE-2022-41725 +CVE-2023-24534 +CVE-2023-24536 +CVE-2023-24537 +CVE-2023-24539 +CVE-2023-29400 +CVE-2023-29403 +CVE-2023-39325 +CVE-2023-45283 +CVE-2023-45287 +CVE-2023-45288 +CVE-2024-34156 \ No newline at end of file diff --git a/tox.ini b/tox.ini index f341365..b6eb614 100644 --- a/tox.ini +++ b/tox.ini @@ -108,6 +108,7 @@ deps = pytest pytest-cov pytest-operator + websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184 # Last compatible version with Juju 2.9 juju==3.0.4 -r{toxinidir}/requirements.txt From 4c8e4fa7d4a017af83da5d35bb629ce814c4f9bd Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 12:28:28 +0530 Subject: [PATCH 09/29] Update liscense --- .licenserc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.licenserc.yaml b/.licenserc.yaml index e4a7d1b..ed68438 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -19,6 +19,7 @@ header: - '.flake8' - '.jujuignore' - '.gitignore' + - '.trivyignore' - '.licenserc.yaml' - 'CODEOWNERS' - 'icon.svg' From 22ca608ed326a72e0c5b6d85ef47bf17dbaa0608 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Thu, 12 Dec 2024 22:15:52 +0530 Subject: [PATCH 10/29] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f75d15..c47cffd 100644 --- a/README.md +++ b/README.md @@ -69,5 +69,5 @@ open source project that warmly welcomes community projects, contributions, suggestions, fixes and constructive feedback. * [Code of conduct](https://ubuntu.com/community/code-of-conduct) * [Get support](https://discourse.charmhub.io/) -* [Contribute](https://charmhub.io/content-cache-k8s/docs/how-to-guides-contributing) +* [Contribute](https://charmhub.io/content-cache-k8s/docs/how-to-contribute) * [Matrix](https://matrix.to/#/#charmhub-charmdev:ubuntu.com) From f5386dff2440a1ccb29b8f7c8fe0e9f0b953d285 Mon Sep 17 00:00:00 2001 From: swetha1654 Date: Fri, 13 Dec 2024 11:52:45 +0530 Subject: [PATCH 11/29] Update README.md Co-authored-by: Erin Conley --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c47cffd..482f995 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ a fast connection to the Internet. For information about how to deploy, integrate, and manage this charm, see the Official [Content Cache Documentation](https://charmhub.io/content-cache-k8s/docs). -## Get Started +## Get started To begin, refer to the [Content Cache tutorial](https://charmhub.io/content-cache-k8s/docs/tutorial-getting-started) for step-by-step instructions. From 19a7d6b3173fb6fd0c9d09460a7d847161449ee4 Mon Sep 17 00:00:00 2001 From: swetha1654 Date: Fri, 13 Dec 2024 11:52:56 +0530 Subject: [PATCH 12/29] Update README.md Co-authored-by: Erin Conley --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 482f995..85c8b9e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ For information about how to deploy, integrate, and manage this charm, see the O To begin, refer to the [Content Cache tutorial](https://charmhub.io/content-cache-k8s/docs/tutorial-getting-started) for step-by-step instructions. -### Basic Operations +### Basic operations The following actions are available for the charm: - report-visits-by-ip From 1c376abfe8bdbf6f89c3e332aca14df3e620b07f Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Fri, 13 Dec 2024 11:53:45 +0530 Subject: [PATCH 13/29] Update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 85c8b9e..37777d7 100644 --- a/README.md +++ b/README.md @@ -70,4 +70,5 @@ suggestions, fixes and constructive feedback. * [Code of conduct](https://ubuntu.com/community/code-of-conduct) * [Get support](https://discourse.charmhub.io/) * [Contribute](https://charmhub.io/content-cache-k8s/docs/how-to-contribute) +* [Issues](https://github.com/canonical/content-cache-k8s-operator/issues) * [Matrix](https://matrix.to/#/#charmhub-charmdev:ubuntu.com) From 109da427cd7716c4206ecb8e21ac8c97747c4332 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 11:15:56 +0530 Subject: [PATCH 14/29] Update readme --- .github/workflows/integration_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index b5132c2..e0c0109 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -8,6 +8,7 @@ jobs: uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main secrets: inherit with: + juju-channel: 3.6/stable setup-devstack-swift: true trivy-image-config: "trivy.yaml" extra-arguments: "--openstack-rc=${GITHUB_WORKSPACE}/openrc" From 75c5fd4f9ff0db1cd9eacb1798241e0944186d4f Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 11:38:04 +0530 Subject: [PATCH 15/29] Update juju version --- .github/workflows/integration_test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index e0c0109..acbedac 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -8,7 +8,8 @@ jobs: uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main secrets: inherit with: - juju-channel: 3.6/stable + juju-channel: 3/stable + channel: 1.29-strict/stable setup-devstack-swift: true trivy-image-config: "trivy.yaml" extra-arguments: "--openstack-rc=${GITHUB_WORKSPACE}/openrc" From c19753f43990b872321ed0e5d8915f70650668d3 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 12:33:43 +0530 Subject: [PATCH 16/29] add ops_test.model --- tests/integration/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index c504dfb..4d38037 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -43,6 +43,7 @@ async def _run_action(application_name: str, action_name: str, **params): Returns: The results of the executed action """ + assert ops_test.model application = ops_test.model.applications[application_name] action = await application.units[0].run_action(action_name, **params) await action.wait() From f13bccc5c2d021b549503b47a8d6d38b7362ce2f Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 14:45:26 +0530 Subject: [PATCH 17/29] add wait for idle --- tests/integration/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 4d38037..63b9a48 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -144,6 +144,7 @@ async def app( channel="beta", config={"src-overwrite": json.dumps(any_charm_src_overwrite)}, ) + await ops_test.model.wait_for_idle(timeout=600) await run_action(any_app_name, "rpc", method="start_server") await ops_test.model.wait_for_idle() From 1a2d62d091821cd2d7d7846b0b04b16e40745aa7 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 20:13:09 +0530 Subject: [PATCH 18/29] add wait for idle --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9684eab..ecefe5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ cosl -ops>=1.2.0 +ops==2.14.1 tabulate From 500b6f7be9b63e14f83330dfafe1c1649200e0ca Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 20:27:13 +0530 Subject: [PATCH 19/29] pin libraries --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ecefe5b..6f1c10f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -cosl +cosl==0.0.12 ops==2.14.1 tabulate From 6340087704d3dcc3165f34bc86d85d217401b3b9 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 21:02:06 +0530 Subject: [PATCH 20/29] pin libraries --- .github/workflows/integration_test.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index acbedac..b5132c2 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -8,8 +8,6 @@ jobs: uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main secrets: inherit with: - juju-channel: 3/stable - channel: 1.29-strict/stable setup-devstack-swift: true trivy-image-config: "trivy.yaml" extra-arguments: "--openstack-rc=${GITHUB_WORKSPACE}/openrc" From 3a27096363a32b8e3ab9d2a78de3d3bb6adbaae1 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Mon, 16 Dec 2024 21:03:46 +0530 Subject: [PATCH 21/29] pin libraries --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6f1c10f..2a07e6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ cosl==0.0.12 -ops==2.14.1 +ops==2.14.1 tabulate From 8a3114780f3c29834b24c644f035792d3924942c Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Tue, 17 Dec 2024 11:41:09 +0530 Subject: [PATCH 22/29] charmcraft change --- charmcraft.yaml | 7 ++++++- requirements.txt | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charmcraft.yaml b/charmcraft.yaml index b19c42c..e63b804 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -11,7 +11,12 @@ bases: channel: "22.04" parts: charm: - prime: + plugin: charm + source: . + rock_data: + plugin: dump + source: . + prime: - content-cache_rock/nginx_cfg.tmpl build-snaps: - rustup diff --git a/requirements.txt b/requirements.txt index 2a07e6c..9684eab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -cosl==0.0.12 -ops==2.14.1 +cosl +ops>=1.2.0 tabulate From 16b9fe0ac0f60cf11bb77930564d67163b466a8b Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Tue, 17 Dec 2024 12:10:06 +0530 Subject: [PATCH 23/29] charmcraft change --- charmcraft.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/charmcraft.yaml b/charmcraft.yaml index e63b804..3ed817b 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -13,11 +13,6 @@ parts: charm: plugin: charm source: . - rock_data: - plugin: dump - source: . - prime: - - content-cache_rock/nginx_cfg.tmpl build-snaps: - rustup override-build: | @@ -27,4 +22,10 @@ parts: - libffi-dev - libssl-dev - pkg-config + rock_data: + plugin: dump + source: . + prime: + - content-cache_rock/nginx_cfg.tmpl + From 8e971fd0cb15ccf6305b72bd959a4cccdbfae541 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Tue, 17 Dec 2024 13:41:39 +0530 Subject: [PATCH 24/29] README update --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 37777d7..ba2de44 100644 --- a/README.md +++ b/README.md @@ -43,12 +43,15 @@ You can find more information about supported actions in [the Charmhub documenta ## Integrations -Content-cache is meant to serve as cache for another charm. You can use Hello-kubecon as an example: +Content-cache is meant to serve as cache for another charm. You can use Wordpress as an example: ``` juju deploy content-cache-k8s -juju deploy hello-kubecon -juju relate content-cache-k8s:ingress-proxy hello-kubecon +juju deploy wordpress-k8s +juju deploy mysql-k8s --trust + +juju integrate wordpress-k8s mysql-k8s:database +juju integrate content-cache-k8s:nginx-proxy wordpress-k8s ``` Apart from this integration, the charm can be integrated with other Juju charms and services as well. You can find the full list of integrations in [the Charmhub documentation](https://charmhub.io/content-cache-k8s/integrations). From 57924d908ff176248b2360918ea953331b6de1e7 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Tue, 17 Dec 2024 19:06:03 +0530 Subject: [PATCH 25/29] README update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba2de44..7200c92 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ The following actions are available for the charm: - report-visits-by-ip Tuning options include: -- cache storage size +- cache storage size - maximum request size to cache - cache validity duration From 62a26e48e797f80caede077084bd494a0adb816a Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Tue, 17 Dec 2024 19:32:10 +0530 Subject: [PATCH 26/29] change juju and microk8s version --- .github/workflows/integration_test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index b5132c2..673eeac 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -10,4 +10,6 @@ jobs: with: setup-devstack-swift: true trivy-image-config: "trivy.yaml" + juju-channel: 3/stable + channel: 1.29-strict/stable extra-arguments: "--openstack-rc=${GITHUB_WORKSPACE}/openrc" From 9adede7fde0be82c9dbc0d48b5c20b96c80609bb Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Wed, 18 Dec 2024 10:56:40 +0530 Subject: [PATCH 27/29] CI failure --- tox.ini | 2 -- 1 file changed, 2 deletions(-) diff --git a/tox.ini b/tox.ini index b6eb614..b21e06c 100644 --- a/tox.ini +++ b/tox.ini @@ -108,8 +108,6 @@ deps = pytest pytest-cov pytest-operator - websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184 - # Last compatible version with Juju 2.9 juju==3.0.4 -r{toxinidir}/requirements.txt -r{toxinidir}/tests/integration/requirements.txt From 273b33ca7af9f911da6af0bd67f4a9a3270cefd2 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Wed, 18 Dec 2024 11:02:58 +0530 Subject: [PATCH 28/29] CI failure --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b21e06c..be99ccc 100644 --- a/tox.ini +++ b/tox.ini @@ -108,7 +108,7 @@ deps = pytest pytest-cov pytest-operator - juju==3.0.4 + juju -r{toxinidir}/requirements.txt -r{toxinidir}/tests/integration/requirements.txt commands = From 0844c512f6e6aba0bc2f28451f35e8cd99591477 Mon Sep 17 00:00:00 2001 From: Swetha Swaminathan Date: Wed, 18 Dec 2024 11:29:43 +0530 Subject: [PATCH 29/29] CI failure --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index be99ccc..b9c14bb 100644 --- a/tox.ini +++ b/tox.ini @@ -108,6 +108,7 @@ deps = pytest pytest-cov pytest-operator + websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184 juju -r{toxinidir}/requirements.txt -r{toxinidir}/tests/integration/requirements.txt