From ef0bf50e2678631ecd2da5c29daed9705b686eb0 Mon Sep 17 00:00:00 2001 From: Gustavo Diaz Date: Thu, 25 Sep 2025 05:23:19 +0000 Subject: [PATCH] Ready condition migration for documentdb controller --- apis/v1alpha1/ack-generate-metadata.yaml | 8 ++-- ...ocumentdb.services.k8s.aws_dbclusters.yaml | 2 +- ...cumentdb.services.k8s.aws_dbinstances.yaml | 2 +- ...entdb.services.k8s.aws_dbsubnetgroups.yaml | 2 +- go.mod | 2 + go.sum | 4 +- ...ocumentdb.services.k8s.aws_dbclusters.yaml | 2 +- ...cumentdb.services.k8s.aws_dbinstances.yaml | 2 +- ...entdb.services.k8s.aws_dbsubnetgroups.yaml | 2 +- .../services.k8s.aws_adoptedresources.yaml | 2 +- helm/crds/services.k8s.aws_fieldexports.yaml | 2 +- pkg/resource/db_cluster/references.go | 40 ++++++++++--------- pkg/resource/db_instance/references.go | 14 ++++--- pkg/resource/db_subnet_group/references.go | 14 ++++--- test/e2e/condition.py | 30 +++++++------- test/e2e/requirements.txt | 2 +- test/e2e/tests/test_db_cluster.py | 4 +- test/e2e/tests/test_db_instance.py | 10 ++--- test/e2e/tests/test_db_subnet_group.py | 2 +- 19 files changed, 78 insertions(+), 68 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 145531b..3ce1848 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2025-09-19T17:06:33Z" - build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd - go_version: go1.24.6 - version: v0.52.0 + build_date: "2025-09-25T05:22:21Z" + build_hash: 9c388d9668ea19d0b1b65566d492c4f67c6e64c8 + go_version: go1.24.7 + version: 9c388d9 api_directory_checksum: 00c61153457eb7e48d4a9c003e93e022183ff8cd api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/crd/bases/documentdb.services.k8s.aws_dbclusters.yaml b/config/crd/bases/documentdb.services.k8s.aws_dbclusters.yaml index 36edfff..1e161be 100644 --- a/config/crd/bases/documentdb.services.k8s.aws_dbclusters.yaml +++ b/config/crd/bases/documentdb.services.k8s.aws_dbclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dbclusters.documentdb.services.k8s.aws spec: group: documentdb.services.k8s.aws diff --git a/config/crd/bases/documentdb.services.k8s.aws_dbinstances.yaml b/config/crd/bases/documentdb.services.k8s.aws_dbinstances.yaml index a827643..b8f4989 100644 --- a/config/crd/bases/documentdb.services.k8s.aws_dbinstances.yaml +++ b/config/crd/bases/documentdb.services.k8s.aws_dbinstances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dbinstances.documentdb.services.k8s.aws spec: group: documentdb.services.k8s.aws diff --git a/config/crd/bases/documentdb.services.k8s.aws_dbsubnetgroups.yaml b/config/crd/bases/documentdb.services.k8s.aws_dbsubnetgroups.yaml index e5fa732..71e124b 100644 --- a/config/crd/bases/documentdb.services.k8s.aws_dbsubnetgroups.yaml +++ b/config/crd/bases/documentdb.services.k8s.aws_dbsubnetgroups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dbsubnetgroups.documentdb.services.k8s.aws spec: group: documentdb.services.k8s.aws diff --git a/go.mod b/go.mod index a9913ca..b6889f9 100644 --- a/go.mod +++ b/go.mod @@ -90,3 +90,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +replace github.com/aws-controllers-k8s/runtime => github.com/gustavodiaz7722/ack-runtime v0.57.0 diff --git a/go.sum b/go.sum index 756b53e..240c959 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ github.com/aws-controllers-k8s/ec2-controller v1.2.2 h1:ek/cGd76XTWQXe6185nxrmEm github.com/aws-controllers-k8s/ec2-controller v1.2.2/go.mod h1:4e2L1aHo1fk3ihVTRmnhA6VJ2NSSoYPEf1GZNYYPwLw= github.com/aws-controllers-k8s/kms-controller v1.0.9 h1:GZHSnuZBoWp9r6RaJ3siyDn5BRhDuaZJXtdBKeAiLSw= github.com/aws-controllers-k8s/kms-controller v1.0.9/go.mod h1:Pnz0d5sly7dUgmYMDJWSRIKASOujJFi/b8N2q1qCLqU= -github.com/aws-controllers-k8s/runtime v0.52.0 h1:Q5UIAn6SSBr60t/DiU/zr6NLBlUuK2AG3yy2ma/9gDU= -github.com/aws-controllers-k8s/runtime v0.52.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc= github.com/aws/aws-sdk-go v1.49.24 h1:2ekq9ZvaoB2aRbTDfARzgVGUBB9N8XD2QYhFmTBlp+c= github.com/aws/aws-sdk-go v1.49.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk= @@ -88,6 +86,8 @@ github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgY github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gustavodiaz7722/ack-runtime v0.57.0 h1:85zJyvdPpzOTaWE0icljJcMRf0qlP0oWdOT05hMZ6Z0= +github.com/gustavodiaz7722/ack-runtime v0.57.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc= github.com/itchyny/gojq v0.12.6 h1:VjaFn59Em2wTxDNGcrRkDK9ZHMNa8IksOgL13sLL4d0= github.com/itchyny/gojq v0.12.6/go.mod h1:ZHrkfu7A+RbZLy5J1/JKpS4poEqrzItSTGDItqsfP0A= github.com/itchyny/timefmt-go v0.1.3 h1:7M3LGVDsqcd0VZH2U+x393obrzZisp7C0uEe921iRkU= diff --git a/helm/crds/documentdb.services.k8s.aws_dbclusters.yaml b/helm/crds/documentdb.services.k8s.aws_dbclusters.yaml index 5c4fd67..7127887 100644 --- a/helm/crds/documentdb.services.k8s.aws_dbclusters.yaml +++ b/helm/crds/documentdb.services.k8s.aws_dbclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dbclusters.documentdb.services.k8s.aws spec: group: documentdb.services.k8s.aws diff --git a/helm/crds/documentdb.services.k8s.aws_dbinstances.yaml b/helm/crds/documentdb.services.k8s.aws_dbinstances.yaml index bd82775..5368586 100644 --- a/helm/crds/documentdb.services.k8s.aws_dbinstances.yaml +++ b/helm/crds/documentdb.services.k8s.aws_dbinstances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dbinstances.documentdb.services.k8s.aws spec: group: documentdb.services.k8s.aws diff --git a/helm/crds/documentdb.services.k8s.aws_dbsubnetgroups.yaml b/helm/crds/documentdb.services.k8s.aws_dbsubnetgroups.yaml index e5fa732..71e124b 100644 --- a/helm/crds/documentdb.services.k8s.aws_dbsubnetgroups.yaml +++ b/helm/crds/documentdb.services.k8s.aws_dbsubnetgroups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: dbsubnetgroups.documentdb.services.k8s.aws spec: group: documentdb.services.k8s.aws diff --git a/helm/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml index b7be322..d6cdd10 100644 --- a/helm/crds/services.k8s.aws_adoptedresources.yaml +++ b/helm/crds/services.k8s.aws_adoptedresources.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: adoptedresources.services.k8s.aws spec: group: services.k8s.aws diff --git a/helm/crds/services.k8s.aws_fieldexports.yaml b/helm/crds/services.k8s.aws_fieldexports.yaml index 49b4f38..6e2c61e 100644 --- a/helm/crds/services.k8s.aws_fieldexports.yaml +++ b/helm/crds/services.k8s.aws_fieldexports.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: fieldexports.services.k8s.aws spec: group: services.k8s.aws diff --git a/pkg/resource/db_cluster/references.go b/pkg/resource/db_cluster/references.go index 4764834..6da4e86 100644 --- a/pkg/resource/db_cluster/references.go +++ b/pkg/resource/db_cluster/references.go @@ -26,6 +26,7 @@ import ( ec2apitypes "github.com/aws-controllers-k8s/ec2-controller/apis/v1alpha1" kmsapitypes "github.com/aws-controllers-k8s/kms-controller/apis/v1alpha1" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" @@ -165,8 +166,9 @@ func getReferencedResourceState_DBSubnetGroup( } var refResourceTerminal bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeTerminal && - cond.Status == corev1.ConditionTrue { + if cond.Type == ackv1alpha1.ConditionTypeReady && + cond.Status == corev1.ConditionFalse && + *cond.Reason == ackcondition.TerminalReason { return ackerr.ResourceReferenceTerminalFor( "DBSubnetGroup", namespace, name) @@ -177,14 +179,14 @@ func getReferencedResourceState_DBSubnetGroup( "DBSubnetGroup", namespace, name) } - var refResourceSynced bool + var refResourceReady bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeResourceSynced && + if cond.Type == ackv1alpha1.ConditionTypeReady && cond.Status == corev1.ConditionTrue { - refResourceSynced = true + refResourceReady = true } } - if !refResourceSynced { + if !refResourceReady { return ackerr.ResourceReferenceNotSyncedFor( "DBSubnetGroup", namespace, name) @@ -248,8 +250,9 @@ func getReferencedResourceState_Key( } var refResourceTerminal bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeTerminal && - cond.Status == corev1.ConditionTrue { + if cond.Type == ackv1alpha1.ConditionTypeReady && + cond.Status == corev1.ConditionFalse && + *cond.Reason == ackcondition.TerminalReason { return ackerr.ResourceReferenceTerminalFor( "Key", namespace, name) @@ -260,14 +263,14 @@ func getReferencedResourceState_Key( "Key", namespace, name) } - var refResourceSynced bool + var refResourceReady bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeResourceSynced && + if cond.Type == ackv1alpha1.ConditionTypeReady && cond.Status == corev1.ConditionTrue { - refResourceSynced = true + refResourceReady = true } } - if !refResourceSynced { + if !refResourceReady { return ackerr.ResourceReferenceNotSyncedFor( "Key", namespace, name) @@ -336,8 +339,9 @@ func getReferencedResourceState_SecurityGroup( } var refResourceTerminal bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeTerminal && - cond.Status == corev1.ConditionTrue { + if cond.Type == ackv1alpha1.ConditionTypeReady && + cond.Status == corev1.ConditionFalse && + *cond.Reason == ackcondition.TerminalReason { return ackerr.ResourceReferenceTerminalFor( "SecurityGroup", namespace, name) @@ -348,14 +352,14 @@ func getReferencedResourceState_SecurityGroup( "SecurityGroup", namespace, name) } - var refResourceSynced bool + var refResourceReady bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeResourceSynced && + if cond.Type == ackv1alpha1.ConditionTypeReady && cond.Status == corev1.ConditionTrue { - refResourceSynced = true + refResourceReady = true } } - if !refResourceSynced { + if !refResourceReady { return ackerr.ResourceReferenceNotSyncedFor( "SecurityGroup", namespace, name) diff --git a/pkg/resource/db_instance/references.go b/pkg/resource/db_instance/references.go index 5b7ce56..e2122da 100644 --- a/pkg/resource/db_instance/references.go +++ b/pkg/resource/db_instance/references.go @@ -25,6 +25,7 @@ import ( kmsapitypes "github.com/aws-controllers-k8s/kms-controller/apis/v1alpha1" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" @@ -133,8 +134,9 @@ func getReferencedResourceState_Key( } var refResourceTerminal bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeTerminal && - cond.Status == corev1.ConditionTrue { + if cond.Type == ackv1alpha1.ConditionTypeReady && + cond.Status == corev1.ConditionFalse && + *cond.Reason == ackcondition.TerminalReason { return ackerr.ResourceReferenceTerminalFor( "Key", namespace, name) @@ -145,14 +147,14 @@ func getReferencedResourceState_Key( "Key", namespace, name) } - var refResourceSynced bool + var refResourceReady bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeResourceSynced && + if cond.Type == ackv1alpha1.ConditionTypeReady && cond.Status == corev1.ConditionTrue { - refResourceSynced = true + refResourceReady = true } } - if !refResourceSynced { + if !refResourceReady { return ackerr.ResourceReferenceNotSyncedFor( "Key", namespace, name) diff --git a/pkg/resource/db_subnet_group/references.go b/pkg/resource/db_subnet_group/references.go index 9a244c2..57d0e30 100644 --- a/pkg/resource/db_subnet_group/references.go +++ b/pkg/resource/db_subnet_group/references.go @@ -25,6 +25,7 @@ import ( ec2apitypes "github.com/aws-controllers-k8s/ec2-controller/apis/v1alpha1" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" @@ -141,8 +142,9 @@ func getReferencedResourceState_Subnet( } var refResourceTerminal bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeTerminal && - cond.Status == corev1.ConditionTrue { + if cond.Type == ackv1alpha1.ConditionTypeReady && + cond.Status == corev1.ConditionFalse && + *cond.Reason == ackcondition.TerminalReason { return ackerr.ResourceReferenceTerminalFor( "Subnet", namespace, name) @@ -153,14 +155,14 @@ func getReferencedResourceState_Subnet( "Subnet", namespace, name) } - var refResourceSynced bool + var refResourceReady bool for _, cond := range obj.Status.Conditions { - if cond.Type == ackv1alpha1.ConditionTypeResourceSynced && + if cond.Type == ackv1alpha1.ConditionTypeReady && cond.Status == corev1.ConditionTrue { - refResourceSynced = true + refResourceReady = true } } - if !refResourceSynced { + if !refResourceReady { return ackerr.ResourceReferenceNotSyncedFor( "Subnet", namespace, name) diff --git a/test/e2e/condition.py b/test/e2e/condition.py index 3d92b5f..4768f5a 100644 --- a/test/e2e/condition.py +++ b/test/e2e/condition.py @@ -22,7 +22,7 @@ from acktest.k8s import resource as k8s CONDITION_TYPE_ADOPTED = "ACK.Adopted" -CONDITION_TYPE_RESOURCE_SYNCED = "ACK.ResourceSynced" +CONDITION_TYPE_READY = "Ready" CONDITION_TYPE_TERMINAL = "ACK.Terminal" CONDITION_TYPE_RECOVERABLE = "ACK.Recoverable" CONDITION_TYPE_ADVISORY = "ACK.Advisory" @@ -31,11 +31,11 @@ def assert_type_status( ref: k8s.CustomResourceReference, - cond_type_match: str = CONDITION_TYPE_RESOURCE_SYNCED, + cond_type_match: str = CONDITION_TYPE_READY, cond_status_match: bool = True, ): """Asserts that the supplied resource has a condition of type - ACK.ResourceSynced and that the Status of this condition is True. + Ready and that the Status of this condition is True. Usage: from acktest.k8s import resource as k8s @@ -50,7 +50,7 @@ def assert_type_status( k8s.wait_resource_consumed_by_controller(ref) condition.assert_type_status( ref, - condition.CONDITION_TYPE_RESOURCE_SYNCED, + condition.CONDITION_TYPE_READY, False) Raises: @@ -75,7 +75,7 @@ def assert_synced_status( cond_status_match: bool, ): """Asserts that the supplied resource has a condition of type - ACK.ResourceSynced and that the Status of this condition is True. + Ready and that the Status of this condition is True. Usage: from acktest.k8s import resource as k8s @@ -91,15 +91,15 @@ def assert_synced_status( condition.assert_synced_status(ref, False) Raises: - pytest.fail when ACK.ResourceSynced condition is not found or is not in + pytest.fail when Ready condition is not found or is not in a True status. """ - assert_type_status(ref, CONDITION_TYPE_RESOURCE_SYNCED, cond_status_match) + assert_type_status(ref, CONDITION_TYPE_READY, cond_status_match) -def assert_synced(ref: k8s.CustomResourceReference): +def assert_ready(ref: k8s.CustomResourceReference): """Asserts that the supplied resource has a condition of type - ACK.ResourceSynced and that the Status of this condition is True. + Ready and that the Status of this condition is True. Usage: from acktest.k8s import resource as k8s @@ -112,18 +112,18 @@ def assert_synced(ref: k8s.CustomResourceReference): ) k8s.create_custom_resource(ref, resource_data) k8s.wait_resource_consumed_by_controller(ref) - condition.assert_synced(ref) + condition.assert_ready(ref) Raises: - pytest.fail when ACK.ResourceSynced condition is not found or is not in + pytest.fail when Ready condition is not found or is not in a True status. """ return assert_synced_status(ref, True) -def assert_not_synced(ref: k8s.CustomResourceReference): +def assert_not_ready(ref: k8s.CustomResourceReference): """Asserts that the supplied resource has a condition of type - ACK.ResourceSynced and that the Status of this condition is False. + Ready and that the Status of this condition is False. Usage: from acktest.k8s import resource as k8s @@ -136,10 +136,10 @@ def assert_not_synced(ref: k8s.CustomResourceReference): ) k8s.create_custom_resource(ref, resource_data) k8s.wait_resource_consumed_by_controller(ref) - condition.assert_not_synced(ref) + condition.assert_not_ready(ref) Raises: - pytest.fail when ACK.ResourceSynced condition is not found or is not in + pytest.fail when Ready condition is not found or is not in a False status. """ return assert_synced_status(ref, False) diff --git a/test/e2e/requirements.txt b/test/e2e/requirements.txt index 8c73c0d..6e2ab16 100644 --- a/test/e2e/requirements.txt +++ b/test/e2e/requirements.txt @@ -1 +1 @@ -acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@1d9d5bb46a1e4d3706c7ce86700773ab2eea955c +acktest @ git+https://github.com/gustavodiaz7722/ack-test-infra.git@4a5c296da0fe386eadf95c242591ae4724cd0428 diff --git a/test/e2e/tests/test_db_cluster.py b/test/e2e/tests/test_db_cluster.py index 3a572d3..f7ae65c 100644 --- a/test/e2e/tests/test_db_cluster.py +++ b/test/e2e/tests/test_db_cluster.py @@ -72,7 +72,7 @@ def docdb_cluster(k8s_secret): assert 'status' in cr assert 'status' in cr['status'] assert cr['status']['status'] == 'creating' - condition.assert_not_synced(ref) + condition.assert_not_ready(ref) yield (ref, cr, db_cluster_id) @@ -112,7 +112,7 @@ def test_crud( assert 'status' in cr assert 'status' in cr['status'] assert cr['status']['status'] != 'creating' - condition.assert_synced(ref) + condition.assert_ready(ref) latest = db_cluster.get(db_cluster_id) assert latest is not None diff --git a/test/e2e/tests/test_db_instance.py b/test/e2e/tests/test_db_instance.py index 83799a0..1e6c459 100644 --- a/test/e2e/tests/test_db_instance.py +++ b/test/e2e/tests/test_db_instance.py @@ -90,10 +90,10 @@ def test_crud( assert 'status' in cr assert 'dbInstanceStatus' in cr['status'] assert cr['status']['dbInstanceStatus'] == 'creating' - condition.assert_not_synced(ref) + condition.assert_not_ready(ref) # Wait for the resource to get synced - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=MAX_WAIT_FOR_SYNCED_MINUTES) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=MAX_WAIT_FOR_SYNCED_MINUTES) # After the resource is synced, assert that DBInstanceStatus is available latest = db_instance.get(db_instance_id) @@ -105,7 +105,7 @@ def test_crud( assert 'status' in cr assert 'dbInstanceStatus' in cr['status'] assert cr['status']['dbInstanceStatus'] != 'creating' - condition.assert_synced(ref) + condition.assert_ready(ref) latest = db_instance.get(db_instance_id) assert latest is not None @@ -117,7 +117,7 @@ def test_crud( time.sleep(MODIFY_WAIT_AFTER_SECONDS) # wait for the resource to get synced after the patch - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=MAX_WAIT_FOR_SYNCED_MINUTES) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=MAX_WAIT_FOR_SYNCED_MINUTES) # After resource is synced again, assert that patches are reflected in the AWS resource latest = db_instance.get(db_instance_id) @@ -131,7 +131,7 @@ def test_crud( time.sleep(MODIFY_WAIT_AFTER_SECONDS) # wait for the resource to get synced after the patch - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=MAX_WAIT_FOR_SYNCED_MINUTES) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=MAX_WAIT_FOR_SYNCED_MINUTES) # After resource is synced again, assert that patches are reflected in the AWS resource latest = db_instance.get(db_instance_id) diff --git a/test/e2e/tests/test_db_subnet_group.py b/test/e2e/tests/test_db_subnet_group.py index 26a292a..43277fa 100644 --- a/test/e2e/tests/test_db_subnet_group.py +++ b/test/e2e/tests/test_db_subnet_group.py @@ -60,7 +60,7 @@ def subnet_group_2az(): assert cr is not None assert k8s.get_resource_exists(ref) - condition.assert_synced(ref) + condition.assert_ready(ref) yield ref, cr, resource_name