From d4bbc65cb2f05129684985b30e2a34532af72598 Mon Sep 17 00:00:00 2001 From: NohaIhab Date: Fri, 8 Sep 2023 13:54:57 +0000 Subject: [PATCH 1/2] ci: update juju to 3.1 and microk8s to 1.25 --- .github/workflows/integrate.yaml | 6 +++--- charms/argo-controller/requirements-integration.in | 4 ++-- .../argo-controller/requirements-integration.txt | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 4a48de1..427b93a 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -60,15 +60,15 @@ jobs: uses: charmed-kubernetes/actions-operator@main with: provider: microk8s - channel: 1.24/stable + channel: 1.25-strict/stable microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49" - juju-channel: 2.9/stable + juju-channel: 3.1/stable charmcraft-channel: latest/candidate - name: Build and test working-directory: ./charms/${{ matrix.charm }} run: | - sg microk8s -c "tox -vve integration -- --model testing" + sg snap_microk8s -c "tox -vve integration -- --model testing" # On failure, capture debugging resources - name: Get all diff --git a/charms/argo-controller/requirements-integration.in b/charms/argo-controller/requirements-integration.in index 8305782..8f46bed 100644 --- a/charms/argo-controller/requirements-integration.in +++ b/charms/argo-controller/requirements-integration.in @@ -1,7 +1,7 @@ aiohttp jinja2 -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 pytest-operator requests tenacity diff --git a/charms/argo-controller/requirements-integration.txt b/charms/argo-controller/requirements-integration.txt index 8835b3d..192ecc8 100644 --- a/charms/argo-controller/requirements-integration.txt +++ b/charms/argo-controller/requirements-integration.txt @@ -8,7 +8,7 @@ aiohttp==3.8.5 # via -r requirements-integration.in aiosignal==1.3.1 # via aiohttp -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data async-timeout==4.0.3 # via aiohttp @@ -64,7 +64,7 @@ jinja2==3.1.2 # via # -r requirements-integration.in # pytest-operator -juju==2.9.44.0 +juju==3.2.0.1 # via # -r requirements-integration.in # pytest-operator @@ -100,7 +100,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pluggy==1.2.0 +pluggy==1.3.0 # via pytest prompt-toolkit==3.0.39 # via ipython @@ -132,17 +132,17 @@ pyrfc3339==1.1 # via # juju # macaroonbakery -pytest==7.4.0 +pytest==7.4.1 # via # pytest-asyncio # pytest-operator pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 +pytest-operator==0.29.0 # via -r requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via @@ -199,7 +199,7 @@ urllib3==1.26.16 # requests wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes websockets==7.0 # via juju From 6803314199df691b4c898c817a87e0d4742b5c4c Mon Sep 17 00:00:00 2001 From: NohaIhab Date: Fri, 8 Sep 2023 16:10:35 +0000 Subject: [PATCH 2/2] reqs: run pip-compile --- .../requirements-integration.txt | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/charms/argo-controller/requirements-integration.txt b/charms/argo-controller/requirements-integration.txt index 192ecc8..e6bfc78 100644 --- a/charms/argo-controller/requirements-integration.txt +++ b/charms/argo-controller/requirements-integration.txt @@ -48,6 +48,8 @@ frozenlist==1.4.0 # aiosignal google-auth==2.22.0 # via kubernetes +hvac==1.2.0 + # via juju idna==3.4 # via # requests @@ -64,18 +66,14 @@ jinja2==3.1.2 # via # -r requirements-integration.in # pytest-operator -juju==3.2.0.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -121,6 +119,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -132,7 +132,7 @@ pyrfc3339==1.1 # via # juju # macaroonbakery -pytest==7.4.1 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator @@ -147,16 +147,15 @@ pytz==2023.3.post1 pyyaml==6.0.1 # via # juju - # jujubundlelib # kubernetes # pytest-operator requests==2.31.0 # via # -r requirements-integration.in + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 @@ -174,8 +173,6 @@ stack-data==0.6.2 # via ipython tenacity==8.2.3 # via -r requirements-integration.in -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -201,7 +198,7 @@ wcwidth==0.2.6 # via prompt-toolkit websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju yarl==1.9.2 # via aiohttp