From b74fb7b067471ae6c84148ee0917db6685c93030 Mon Sep 17 00:00:00 2001 From: Gustavo Diaz Date: Thu, 25 Sep 2025 05:30:56 +0000 Subject: [PATCH] Ready condition migration for efs controller --- apis/v1alpha1/ack-generate-metadata.yaml | 8 ++-- .../efs.services.k8s.aws_accesspoints.yaml | 2 +- .../efs.services.k8s.aws_filesystems.yaml | 2 +- .../efs.services.k8s.aws_mounttargets.yaml | 2 +- go.mod | 2 + go.sum | 4 +- .../efs.services.k8s.aws_accesspoints.yaml | 2 +- .../efs.services.k8s.aws_filesystems.yaml | 2 +- .../efs.services.k8s.aws_mounttargets.yaml | 2 +- .../services.k8s.aws_adoptedresources.yaml | 2 +- helm/crds/services.k8s.aws_fieldexports.yaml | 2 +- pkg/resource/access_point/references.go | 14 ++++--- pkg/resource/file_system/references.go | 40 ++++++++++--------- pkg/resource/mount_target/references.go | 40 ++++++++++--------- test/e2e/requirements.txt | 2 +- test/e2e/tests/test_file_system.py | 20 +++++----- 16 files changed, 79 insertions(+), 67 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 34f3760..f6c865e 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:28:33Z" - build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd - go_version: go1.24.6 - version: v0.52.0 + build_date: "2025-09-25T05:29:57Z" + build_hash: 9c388d9668ea19d0b1b65566d492c4f67c6e64c8 + go_version: go1.24.7 + version: 9c388d9 api_directory_checksum: bce84152d4b1ec06243e6f2277eceb15f5610ca4 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/crd/bases/efs.services.k8s.aws_accesspoints.yaml b/config/crd/bases/efs.services.k8s.aws_accesspoints.yaml index 6d1f033..12ee4b3 100644 --- a/config/crd/bases/efs.services.k8s.aws_accesspoints.yaml +++ b/config/crd/bases/efs.services.k8s.aws_accesspoints.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: accesspoints.efs.services.k8s.aws spec: group: efs.services.k8s.aws diff --git a/config/crd/bases/efs.services.k8s.aws_filesystems.yaml b/config/crd/bases/efs.services.k8s.aws_filesystems.yaml index c3796ac..a7f913c 100644 --- a/config/crd/bases/efs.services.k8s.aws_filesystems.yaml +++ b/config/crd/bases/efs.services.k8s.aws_filesystems.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: filesystems.efs.services.k8s.aws spec: group: efs.services.k8s.aws diff --git a/config/crd/bases/efs.services.k8s.aws_mounttargets.yaml b/config/crd/bases/efs.services.k8s.aws_mounttargets.yaml index 83df29c..27ff39e 100644 --- a/config/crd/bases/efs.services.k8s.aws_mounttargets.yaml +++ b/config/crd/bases/efs.services.k8s.aws_mounttargets.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: mounttargets.efs.services.k8s.aws spec: group: efs.services.k8s.aws diff --git a/go.mod b/go.mod index 975d31e..02f0019 100644 --- a/go.mod +++ b/go.mod @@ -91,3 +91,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 1a7a45d..9e49afe 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,6 @@ github.com/aws-controllers-k8s/iam-controller v1.5.0 h1:O9AYY5P8eIFircfkjIEwkXwG github.com/aws-controllers-k8s/iam-controller v1.5.0/go.mod h1:V19V1L0e1Gde8/7Ti0wKugtXU9oK8zaaYDe54TQm94E= 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.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU= @@ -90,6 +88,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/efs.services.k8s.aws_accesspoints.yaml b/helm/crds/efs.services.k8s.aws_accesspoints.yaml index 6d1f033..12ee4b3 100644 --- a/helm/crds/efs.services.k8s.aws_accesspoints.yaml +++ b/helm/crds/efs.services.k8s.aws_accesspoints.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: accesspoints.efs.services.k8s.aws spec: group: efs.services.k8s.aws diff --git a/helm/crds/efs.services.k8s.aws_filesystems.yaml b/helm/crds/efs.services.k8s.aws_filesystems.yaml index 6093762..61b3bb7 100644 --- a/helm/crds/efs.services.k8s.aws_filesystems.yaml +++ b/helm/crds/efs.services.k8s.aws_filesystems.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: filesystems.efs.services.k8s.aws spec: group: efs.services.k8s.aws diff --git a/helm/crds/efs.services.k8s.aws_mounttargets.yaml b/helm/crds/efs.services.k8s.aws_mounttargets.yaml index 83df29c..27ff39e 100644 --- a/helm/crds/efs.services.k8s.aws_mounttargets.yaml +++ b/helm/crds/efs.services.k8s.aws_mounttargets.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: mounttargets.efs.services.k8s.aws spec: group: efs.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/access_point/references.go b/pkg/resource/access_point/references.go index e71b429..60bde56 100644 --- a/pkg/resource/access_point/references.go +++ b/pkg/resource/access_point/references.go @@ -24,6 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" 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" @@ -132,8 +133,9 @@ func getReferencedResourceState_FileSystem( } 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( "FileSystem", namespace, name) @@ -144,14 +146,14 @@ func getReferencedResourceState_FileSystem( "FileSystem", 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( "FileSystem", namespace, name) diff --git a/pkg/resource/file_system/references.go b/pkg/resource/file_system/references.go index 6959e72..9a88ae1 100644 --- a/pkg/resource/file_system/references.go +++ b/pkg/resource/file_system/references.go @@ -26,6 +26,7 @@ import ( iamapitypes "github.com/aws-controllers-k8s/iam-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" @@ -194,8 +195,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) @@ -206,14 +208,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) @@ -279,8 +281,9 @@ func getReferencedResourceState_FileSystem( } 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( "FileSystem", namespace, name) @@ -291,14 +294,14 @@ func getReferencedResourceState_FileSystem( "FileSystem", 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( "FileSystem", namespace, name) @@ -395,8 +398,9 @@ func getReferencedResourceState_Role( } 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( "Role", namespace, name) @@ -407,14 +411,14 @@ func getReferencedResourceState_Role( "Role", 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( "Role", namespace, name) diff --git a/pkg/resource/mount_target/references.go b/pkg/resource/mount_target/references.go index 911aa0f..911cd70 100644 --- a/pkg/resource/mount_target/references.go +++ b/pkg/resource/mount_target/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" @@ -170,8 +171,9 @@ func getReferencedResourceState_FileSystem( } 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( "FileSystem", namespace, name) @@ -182,14 +184,14 @@ func getReferencedResourceState_FileSystem( "FileSystem", 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( "FileSystem", namespace, name) @@ -258,8 +260,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) @@ -270,14 +273,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) @@ -341,8 +344,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) @@ -353,14 +357,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/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_file_system.py b/test/e2e/tests/test_file_system.py index d9c41b7..e6d1593 100644 --- a/test/e2e/tests/test_file_system.py +++ b/test/e2e/tests/test_file_system.py @@ -93,7 +93,7 @@ def test_create_delete(self, efs_client, simple_file_system): validator = EFSValidator(efs_client) assert validator.file_system_exists(file_system_id) - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) def test_create_update_delete(self, efs_client, simple_file_system): (ref, _, file_system_id) = simple_file_system @@ -115,7 +115,7 @@ def test_create_update_delete(self, efs_client, simple_file_system): fs = validator.get_file_system(file_system_id) assert fs is not None - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) assert fs['FileSystems'][0]['ThroughputMode'] == "elastic" assert fs['FileSystems'][0]['FileSystemProtection']['ReplicationOverwriteProtection'] == "DISABLED" @@ -138,7 +138,7 @@ def test_update_policies(self, efs_client, simple_file_system): time.sleep(CREATE_WAIT_AFTER_SECONDS) observedPolicy = validator.get_file_system_policy(file_system_id) - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) assert json.loads(policy) == json.loads(observedPolicy) updates = { @@ -170,7 +170,7 @@ def test_update_backup_policy(self, efs_client, simple_file_system): bp = validator.get_backup_policy(file_system_id) assert bp is not None - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) assert bp['Status'] == "DISABLED" def test_update_lifecycle_policies(self, efs_client, simple_file_system): @@ -180,7 +180,7 @@ def test_update_lifecycle_policies(self, efs_client, simple_file_system): validator = EFSValidator(efs_client) assert validator.file_system_exists(file_system_id) - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) updates = { "spec": { "lifecyclePolicies": [ @@ -193,7 +193,7 @@ def test_update_lifecycle_policies(self, efs_client, simple_file_system): lfps = validator.get_file_system_lifecycle_policy(file_system_id) assert lfps is not None - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) assert lfps[0]['TransitionToIA'] == "AFTER_30_DAYS" def test_update_tags(self, efs_client, simple_file_system): @@ -202,7 +202,7 @@ def test_update_tags(self, efs_client, simple_file_system): validator = EFSValidator(efs_client) assert validator.file_system_exists(file_system_id) - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) desired_tags = [{ "key": "Name", @@ -218,7 +218,7 @@ def test_update_tags(self, efs_client, simple_file_system): fs = validator.get_file_system(file_system_id) assert fs is not None - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) latest_tags = fs['FileSystems'][0]["Tags"] tags.assert_ack_system_tags( @@ -237,7 +237,7 @@ def test_create_replication_configuration(self, efs_client, simple_file_system): validator = EFSValidator(efs_client) assert validator.file_system_exists(file_system_id) - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) # Test adding replication configuration to us-east-1 replication_config = [ @@ -254,7 +254,7 @@ def test_create_replication_configuration(self, efs_client, simple_file_system): time.sleep(UPDATE_WAIT_AFTER_SECONDS) # Verify replication configuration was created - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=5) assert validator.replication_configuration_exists(file_system_id) destinations = validator.get_replication_destinations(file_system_id)