Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2025-09-19T17:18:59Z"
build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd
go_version: go1.24.6
version: v0.52.0
build_date: "2025-09-25T05:41:23Z"
build_hash: 9c388d9668ea19d0b1b65566d492c4f67c6e64c8
go_version: go1.24.7
version: 9c388d9
api_directory_checksum: cecde4bc0ce694585e9462fa53af0a5f58ffc8b5
api_version: v1alpha1
aws_sdk_go_version: v1.32.6
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/keyspaces.services.k8s.aws_keyspaces.yaml
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: keyspaces.keyspaces.services.k8s.aws
spec:
group: keyspaces.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/keyspaces.services.k8s.aws_tables.yaml
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: tables.keyspaces.services.k8s.aws
spec:
group: keyspaces.services.k8s.aws
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,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
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
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.8 h1:gKgEiyJ8CPnr4r6pS06WfNXvp6z34JER1pBIwuocvVA=
github.com/aws/aws-sdk-go v1.49.8/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU=
Expand Down Expand Up @@ -84,6 +82,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/keyspaces.services.k8s.aws_keyspaces.yaml
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: keyspaces.keyspaces.services.k8s.aws
spec:
group: keyspaces.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/keyspaces.services.k8s.aws_tables.yaml
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: tables.keyspaces.services.k8s.aws
spec:
group: keyspaces.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/services.k8s.aws_adoptedresources.yaml
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
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
2 changes: 1 addition & 1 deletion pkg/resource/table/sdk.go

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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from acktest.k8s import resource

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 @@ -28,11 +28,11 @@

def assert_type_status(
ref: resource.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
Expand All @@ -46,7 +46,7 @@ def assert_type_status(
resource.wait_resource_consumed_by_controller(ref)
condition.assert_type_status(
ref,
condition.CONDITION_TYPE_RESOURCE_SYNCED,
condition.CONDITION_TYPE_READY,
False)

Raises:
Expand All @@ -71,7 +71,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
Expand All @@ -86,15 +86,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: resource.CustomResourceReference):
def assert_ready(ref: resource.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
Expand All @@ -106,18 +106,18 @@ def assert_synced(ref: resource.CustomResourceReference):
)
resource.create_custom_resource(ref, resource_data)
resource.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: resource.CustomResourceReference):
def assert_not_ready(ref: resource.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
Expand All @@ -129,10 +129,10 @@ def assert_not_synced(ref: resource.CustomResourceReference):
)
resource.create_custom_resource(ref, resource_data)
resource.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)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@c3ce6b7404c5bf71593a1f23d8b0f13039f4b910
acktest @ git+https://github.com/gustavodiaz7722/ack-test-infra.git@4a5c296da0fe386eadf95c242591ae4724cd0428
2 changes: 1 addition & 1 deletion test/e2e/tests/test_keyspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def test_create_delete_kesypace(self, keyspace_basic):
(ref, res) = keyspace_basic

keyspace_name = res["spec"]["keyspaceName"]
condition.assert_synced(ref)
condition.assert_ready(ref)

# Check Keyspace exists
assert self.keyspace_exists(keyspace_name)
2 changes: 1 addition & 1 deletion test/e2e/tests/test_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def test_create_delete_table(self, table_basic):

keyspace_name = res["spec"]["keyspaceName"]
table_name = res["spec"]["tableName"]
condition.assert_synced(ref)
condition.assert_ready(ref)

# Check Table exists
assert self.table_exists(keyspace_name, table_name)