[DPE-8877] Upgrade MySQL to 8.0.44 (#76)

* Upgrade K8s router operator to 8.0.44

* Upgrade machine router operator to 8.0.44

* Bump workload version

* Add more visible guidance on README

* Make test_upgrade.py to pass

* Remove outdated workaround

* Revert "Make test_upgrade.py to pass"

This reverts commit 1f3e615.

* Fix charm refresh in test_upgrade

* Clarify charm key in refresh_versions.toml

Author: astrojuanlu

README.md

@@ -49,7 +49,14 @@ Relations are defined in `metadata.yaml` are:
 
 ## Contributing
 
+To build the charms:
+
+```
+cd kubernetes && charmcraftlocal pack
+cd machines && charmcraftlocal pack
+```
+
 Please see the [Juju SDK docs](https://juju.is/docs/sdk) for guidelines on
 enhancements to this charm following best practice guidelines, and
 [CONTRIBUTING.md](./CONTRIBUTING.md)
-for developer guidance.
+for further developer guidance.

common/common/workload.py

@@ -272,13 +272,6 @@ def _get_bootstrap_command(
             "--conf-use-gr-notifications",
             "--conf-set-option",
             "metadata_cache:bootstrap.ttl=5",
-            # destination_status added to workaround MySQL Router bug
-            # https://bugs.mysql.com/bug.php?id=118059
-            # TODO: Remove once fixed on upstream
-            "--conf-set-option",
-            "destination_status.error_quarantine_threshold=3",
-            "--conf-set-option",
-            "destination_status.error_quarantine_interval=5",
         ]
 
     def _bootstrap_router(self, *, event, tls: bool) -> None:

kubernetes/metadata.yaml

@@ -59,6 +59,6 @@ resources:
   mysql-router-image:
     type: oci-image
     description: OCI image for mysql-router
-    upstream-source: ghcr.io/canonical/charmed-mysql@sha256:e78bdba30923ec87d67879a284d9162dfbb7600b34cbf3f84c9b4cce08648715
+    upstream-source: ghcr.io/canonical/charmed-mysql@sha256:672f20830d66678a3ece7285048700d6e52a9393202eb51e9749eb35031559c4
 assumes:
   - k8s-api

kubernetes/refresh_versions.toml

@@ -1,4 +1,4 @@
 # https://canonical-charm-refresh.readthedocs-hosted.com/latest/refresh-versions-toml/
 
 charm_major = 1
-workload = "8.0.42"
+workload = "8.0.44"

kubernetes/tests/integration/test_upgrade.py

@@ -36,6 +36,7 @@
 APPLICATION_APP_NAME = APPLICATION_DEFAULT_APP_NAME
 
 METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
+RESOURCES = {"mysql-router-image": METADATA["resources"]["mysql-router-image"]["upstream-source"]}
 
 
 @pytest.mark.abort_on_fail
@@ -98,7 +99,7 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm) -> None:
     mysql_router_application = ops_test.model.applications[MYSQL_ROUTER_APP_NAME]
 
     logger.info("Refresh the charm")
-    await mysql_router_application.refresh(path=charm)
+    await mysql_router_application.refresh(path=charm, resources=RESOURCES)
 
     # Highest to lowest unit number
     refresh_order = sorted(
@@ -171,7 +172,7 @@ async def test_fail_and_rollback(ops_test: OpsTest, charm, continuous_writes) ->
     create_invalid_upgrade_charm(fault_charm)
 
     logger.info("Refreshing mysql router with an invalid charm")
-    await mysql_router_application.refresh(path=fault_charm)
+    await mysql_router_application.refresh(path=fault_charm, resources=RESOURCES)
 
     # Highest to lowest unit number
     refresh_order = sorted(
@@ -192,7 +193,7 @@ async def test_fail_and_rollback(ops_test: OpsTest, charm, continuous_writes) ->
     await ensure_all_units_continuous_writes_incrementing(ops_test)
 
     logger.info("Re-refresh the charm")
-    await mysql_router_application.refresh(path=charm)
+    await mysql_router_application.refresh(path=charm, resources=RESOURCES)
 
     # sleep to ensure that active status from before re-refresh does not affect below check
     time.sleep(15)
@@ -242,6 +243,8 @@ def create_invalid_upgrade_charm(charm_file: str | pathlib.Path) -> None:
         with zipfile.Path(charm_zip, "refresh_versions.toml").open("rb") as file:
             versions = tomli.load(file)
 
+    # "charm" is added during pack time using the charm refresh compatibility version stored as a git tag
+    # so charm can be set after the release (when the version is determined) but before pack time
     versions["charm"] = "8.0/0.0.0"
 
     with zipfile.ZipFile(charm_file, mode="a") as charm_zip:

machines/refresh_versions.toml

@@ -1,15 +1,15 @@
 # https://canonical-charm-refresh.readthedocs-hosted.com/latest/refresh-versions-toml/
 
 charm_major = 1
-workload = "8.0.42"
+workload = "8.0.44"
 
 [snap]
 name = "charmed-mysql"
 
 [snap.revisions]
 # amd64
-x86_64 = "151"
+x86_64 = "159"
 # arm64
-aarch64 = "153"
+aarch64 = "157"
 # s390x
-s390x = "152"
+s390x = "158"