Skip to content

tests: Ready condition rename for documentdb-controller #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tests: Ready condition rename for documentdb-controller #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/documentdb.services.k8s.aws_dbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/documentdb.services.k8s.aws_dbinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/documentdb.services.k8s.aws_dbsubnetgroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/documentdb.services.k8s.aws_dbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/documentdb.services.k8s.aws_dbinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/documentdb.services.k8s.aws_dbsubnetgroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/services.k8s.aws_adoptedresources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/services.k8s.aws_fieldexports.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 22 additions & 18 deletions pkg/resource/db_cluster/references.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions pkg/resource/db_instance/references.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions pkg/resource/db_subnet_group/references.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions test/e2e/condition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion test/e2e/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading