chore: bump versions of things to support testing of this charm again (#16)

* chore: bump action versions in tests workflow

* Build with charmcraft 2.x/stable

* Update to run only on jammy LTS

* Upgrade charm and tests to juju3 standards

Author: Adam Dyess

.charmcraft-channel

@@ -0,0 +1 @@
+2.x/stable

.github/workflows/tests.yaml

@@ -4,7 +4,7 @@ on: [pull_request]
 jobs:
   call-inclusive-naming-check:
     name: Inclusive naming
-    uses: canonical-web-and-design/Inclusive-naming/.github/workflows/woke.yaml@main
+    uses: canonical/inclusive-naming/.github/workflows/woke.yaml@main
     with:
       fail-on-error: "true"
 
@@ -14,28 +14,29 @@ jobs:
     needs:
       - call-inclusive-naming-check
     with:
-      python: "['3.8', '3.9', '3.10']"
+      python: "['3.10', '3.12']"
 
   integration-test:
     name: Integration tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - lint-unit
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v6
       with:
-        python-version: 3.8
-    - name: Install Dependencies
-      run: |
-        pip install tox
+        python-version: 3.12
+    - name: Read charmcraft version file
+      id: charmcraft
+      run: echo "channel=$(cat .charmcraft-channel)" >> $GITHUB_OUTPUT
     - name: Setup operator environment
       uses: charmed-kubernetes/actions-operator@main
       with:
-          provider: microk8s
-          channel: 1.26/stable
+        provider: microk8s
+        channel: 1.34-strict/stable
+        charmcraft-channel: ${{ steps.charmcraft.outputs.channel }}
     - name: Run test
       run: tox -e integration
     - name: Setup Debug Artifact Collection
@@ -50,7 +51,7 @@ jobs:
       run: sudo juju debug-log --replay --no-tail -i gatekeeper-manager-operator | tee tmp/unit-gatekeeper-manager-operator-0.log
     - name: Upload debug artifacts
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: test-run-artifacts
         path: tmp

opa-audit-operator/README.md

@@ -37,18 +37,18 @@ there are multiple ways to gather the audit results. The opa-audit-operator prov
 to make it easier.
 Any namespaces violating a constraint can be listed using the `get-violation` action, e.g. for the constraint described above:
 ```
-juju run-action gatekeeper-audit/0 get-violation constraint-template=K8sRequiredLabels constraint=ns-must-have-gk --wait
+juju run gatekeeper-audit/0 get-violation constraint-template=K8sRequiredLabels constraint=ns-must-have-gk --wait
 ```
 
 To see how many resources violate each policy you need to run:
 ```
-juju run-action gatekeeper-audit/0 list-violations --wait
+juju run gatekeeper-audit/0 list-violations --wait
 ```
 
 ### List policies
 To list all the policies that are currently applied run:
 ```
-juju run-action {unit_name} list-constraints --wait
+juju run {unit_name} list-constraints --wait
 ```
 
 ## Developing

opa-audit-operator/charmcraft.yaml

@@ -2,15 +2,9 @@ type: charm
 bases:
   - build-on:
     - name: "ubuntu"
-      channel: "20.04"
+      channel: "22.04"
       architectures: ["amd64"]
     run-on:
-    - name: "ubuntu"
-      channel: "20.04"
-      architectures:
-        - amd64
-        - arm
-        - arm64
     - name: "ubuntu"
       channel: "22.04"
       architectures:

opa-audit-operator/requirements.txt

@@ -1,4 +1,4 @@
-ops
-lightkube
+ops >= 2.2.0,<3.0
+lightkube>=0.10.1,<0.18.0
 lightkube-models
-git+https://github.com/canonical/ops-lib-manifest.git@a02d83af8febeed39b7324b0247368cfc7105d73
+ops.manifest>=1.1.0,<2.0.0

opa-audit-operator/src/charm.py

@@ -170,7 +170,7 @@ def _on_update_status(self, event):
         elif self.manifests.resources != self.manifests.installed_resources():
             self.unit.status = BlockedStatus(
                 "Missing resources, to reconcile run: "
-                f"`juju run-action {self.unit.name} reconcile-resources`"
+                f"`juju run {self.unit.name} reconcile-resources`"
             )
         elif unready := self.collector.unready:
             # Wait for all installed resource to be ready

opa-audit-operator/tests/integration/test_charm.py

@@ -135,17 +135,9 @@ class TestPolicies:
     async def test_list_no_violations(self, ops_test):
         """This will run before the resources have been audited"""
         unit = list(ops_test.model.units.values())[0]
-        unit_name = unit.name
-        res = await ops_test.juju(
-            "run-action",
-            unit_name,
-            "list-violations",
-            "--wait",
-            "-m",
-            ops_test.model.info.name,
-        )
-        res = yaml.full_load(res[1])[unit.tag]
-        violations = json.loads(res["results"]["constraint-violations"])
+        action = await unit.run_action("list-violations")
+        res = await action.wait()
+        violations = yaml.safe_load(res.results["constraint-violations"])
         assert len(violations) == 2, json.dumps(violations, indent=2)
         assert any(
             v
@@ -191,18 +183,11 @@ async def test_audit(self, ops_test, client):
 
     async def test_list_violations(self, ops_test):
         unit = list(ops_test.model.units.values())[0]
-        unit_name = unit.name
-        res = await ops_test.juju(
-            "run-action",
-            unit_name,
-            "list-violations",
-            "--wait",
-            "-m",
-            ops_test.model.info.name,
-        )
-        res = yaml.full_load(res[1])[unit.tag]
-        violations = json.loads(res["results"]["constraint-violations"])
-        assert res["status"] == "completed"
+        action = await unit.run_action("list-violations")
+        res = await action.wait()
+        violations = yaml.safe_load(res.results["constraint-violations"])
+
+        assert res.status == "completed"
         assert len(violations) == 2
         assert any(
             violation["constraint"] == "ns-must-have-gk"
@@ -228,21 +213,19 @@ async def test_get_violations(self, ops_test):
         }
 
         unit = list(ops_test.model.units.values())[0]
-        unit_name = unit.name
-        res = await ops_test.juju(
-            "run-action",
-            unit_name,
+        action = await unit.run_action(
             "get-violation",
-            "constraint-template=K8sRequiredLabels",
-            "constraint=ns-must-have-gk",
-            "--wait",
-            "-m",
-            ops_test.model.info.name,
+            **{
+                "constraint-template": "K8sRequiredLabels",
+                "constraint": "ns-must-have-gk",
+            },
+        )
+        res = await action.wait()
+        violations = yaml.safe_load(res.results["violations"])
+        assert res.status == "completed"
+        assert any(v == expected_model_violation for v in violations), json.dumps(
+            violations, indent=2
         )
-        res = yaml.full_load(res[1])[unit.tag]
-        violations = json.loads(res["results"]["violations"])
-        assert res["status"] == "completed"
-        assert any(v == expected_model_violation for v in violations)
 
     async def test_reconciliation_required(self, ops_test, client):
         model = ops_test.model
@@ -254,18 +237,9 @@ async def test_reconciliation_required(self, ops_test, client):
             )
 
         unit = list(ops_test.model.units.values())[0]
-        unit_name = unit.name
-        res = await ops_test.juju(
-            "run-action",
-            unit_name,
-            "reconcile-resources",
-            "--wait",
-            "-m",
-            ops_test.model.info.name,
-        )
-
-        res = yaml.full_load(res[1])[unit.tag]
-        assert res["status"] == "completed"
+        action = await unit.run_action("reconcile-resources")
+        res = await action.wait()
+        assert res.status == "completed"
         await model.wait_for_idle(
             apps=["gatekeeper-audit"], status="active", timeout=60
         )

opa-manager-operator/README.md

@@ -37,7 +37,7 @@ Existing namespaces are not affected by this.
 ### Getting policies
 To list all the policies that are currently applied run:
 ```
-juju run-action {unit_name} list-constraints --wait
+juju run {unit_name} list-constraints --wait
 ```
 
 ## Developing

opa-manager-operator/charmcraft.yaml

@@ -2,15 +2,9 @@ type: charm
 bases:
   - build-on:
     - name: "ubuntu"
-      channel: "20.04"
+      channel: "22.04"
       architectures: ["amd64"]
     run-on:
-    - name: "ubuntu"
-      channel: "20.04"
-      architectures:
-        - amd64
-        - arm
-        - arm64
     - name: "ubuntu"
       channel: "22.04"
       architectures:

opa-manager-operator/requirements.txt

@@ -1,4 +1,4 @@
-ops
-lightkube
+ops >= 2.2.0,<3.0
+lightkube>=0.10.1,<0.18.0
 lightkube-models
-git+https://github.com/canonical/ops-lib-manifest.git@a02d83af8febeed39b7324b0247368cfc7105d73
+ops.manifest>=1.1.0,<2.0.0