Merge branch 'main' into workaround

Author: dbasunag

tests/model_registry/constants.py

@@ -41,7 +41,7 @@ class ModelRegistryEndpoints:
 DB_BASE_RESOURCES_NAME: str = "db-model-registry"
 DB_RESOURCE_NAME: str = f"{DB_BASE_RESOURCES_NAME}0"
 MR_DB_IMAGE_DIGEST: str = (
-    "public.ecr.aws/docker/library/mysql@sha256:9de9d54fecee6253130e65154b930978b1fcc336bcc86dfd06e89b72a2588ebe"
+    "public.ecr.aws/docker/library/mysql@sha256:28540698ce89bd72f985044de942d65bd99c6fadb2db105327db57f3f70564f0"
 )
 MODEL_REGISTRY_DB_SECRET_STR_DATA: dict[str, str] = {
     "database-name": "model_registry",

tests/model_registry/utils.py

@@ -38,7 +38,7 @@
 
 ADDRESS_ANNOTATION_PREFIX: str = "routing.opendatahub.io/external-address-"
 MARIA_DB_IMAGE = (
-    "registry.redhat.io/rhel9/mariadb-1011@sha256:5608cce9ca8fed81027c97336d526b80320b0f4517ca5d3d141c0bbd7d563f8a"
+    "registry.redhat.io/rhel9/mariadb-1011@sha256:092407d87f8017bb444a462fb3d38ad5070429e94df7cf6b91d82697f36d0fa9"
 )
 LOGGER = get_logger(name=__name__)
 
@@ -131,7 +131,6 @@ def get_model_registry_deployment_template_dict(
                     "args": [
                         "--datadir",
                         "/var/lib/mysql/datadir",
-                        "--default-authentication-plugin=mysql_native_password",
                     ],
                     "image": MR_DB_IMAGE_DIGEST,
                     "imagePullPolicy": "IfNotPresent",