diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index b4ac5be..e21a591 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-20T00:57:02Z" - build_hash: 5bf1e456e1dfc638d47ab492376335f528c0f455 - go_version: go1.25.0 - version: v0.52.0-1-g5bf1e45 + build_date: "2025-09-25T06:16:43Z" + build_hash: 9c388d9668ea19d0b1b65566d492c4f67c6e64c8 + go_version: go1.24.7 + version: 9c388d9 api_directory_checksum: ce7946ade203ed47906d8cb4cc7bf3f0440eebbd api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/crd/bases/wafv2.services.k8s.aws_ipsets.yaml b/config/crd/bases/wafv2.services.k8s.aws_ipsets.yaml index 60c0787..8dd192a 100644 --- a/config/crd/bases/wafv2.services.k8s.aws_ipsets.yaml +++ b/config/crd/bases/wafv2.services.k8s.aws_ipsets.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: ipsets.wafv2.services.k8s.aws spec: group: wafv2.services.k8s.aws diff --git a/config/crd/bases/wafv2.services.k8s.aws_rulegroups.yaml b/config/crd/bases/wafv2.services.k8s.aws_rulegroups.yaml index 78e2a78..680503c 100644 --- a/config/crd/bases/wafv2.services.k8s.aws_rulegroups.yaml +++ b/config/crd/bases/wafv2.services.k8s.aws_rulegroups.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: rulegroups.wafv2.services.k8s.aws spec: group: wafv2.services.k8s.aws diff --git a/config/crd/bases/wafv2.services.k8s.aws_webacls.yaml b/config/crd/bases/wafv2.services.k8s.aws_webacls.yaml index fd3da7b..48348e5 100644 --- a/config/crd/bases/wafv2.services.k8s.aws_webacls.yaml +++ b/config/crd/bases/wafv2.services.k8s.aws_webacls.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: webacls.wafv2.services.k8s.aws spec: group: wafv2.services.k8s.aws diff --git a/go.mod b/go.mod index 66605b4..c506eec 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 4c30fde..9058b26 100644 --- a/go.sum +++ b/go.sum @@ -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.51.21 h1:UrT6JC9R9PkYYXDZBV0qDKTualMr+bfK2eboTknMgbs= github.com/aws/aws-sdk-go v1.51.21/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU= @@ -86,6 +84,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/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/helm/crds/wafv2.services.k8s.aws_ipsets.yaml b/helm/crds/wafv2.services.k8s.aws_ipsets.yaml index 785fd2b..4e2c0d9 100644 --- a/helm/crds/wafv2.services.k8s.aws_ipsets.yaml +++ b/helm/crds/wafv2.services.k8s.aws_ipsets.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: ipsets.wafv2.services.k8s.aws spec: group: wafv2.services.k8s.aws diff --git a/helm/crds/wafv2.services.k8s.aws_rulegroups.yaml b/helm/crds/wafv2.services.k8s.aws_rulegroups.yaml index 6e22002..813cd6c 100644 --- a/helm/crds/wafv2.services.k8s.aws_rulegroups.yaml +++ b/helm/crds/wafv2.services.k8s.aws_rulegroups.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: rulegroups.wafv2.services.k8s.aws spec: group: wafv2.services.k8s.aws diff --git a/helm/crds/wafv2.services.k8s.aws_webacls.yaml b/helm/crds/wafv2.services.k8s.aws_webacls.yaml index 46245c0..72c9026 100644 --- a/helm/crds/wafv2.services.k8s.aws_webacls.yaml +++ b/helm/crds/wafv2.services.k8s.aws_webacls.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: webacls.wafv2.services.k8s.aws spec: group: wafv2.services.k8s.aws diff --git a/test/e2e/requirements.txt b/test/e2e/requirements.txt index bdf9c5e..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@62b132c217bd912960e268962664c545a6fa824d +acktest @ git+https://github.com/gustavodiaz7722/ack-test-infra.git@4a5c296da0fe386eadf95c242591ae4724cd0428 diff --git a/test/e2e/tests/test_ip_set.py b/test/e2e/tests/test_ip_set.py index eb3c678..fc6e14d 100644 --- a/test/e2e/tests/test_ip_set.py +++ b/test/e2e/tests/test_ip_set.py @@ -71,7 +71,7 @@ def test_crud(self, simple_ip_set): ref, _ = simple_ip_set time.sleep(CREATE_WAIT_SECONDS) - condition.assert_synced(ref) + condition.assert_ready(ref) cr = k8s.get_resource(ref) diff --git a/test/e2e/tests/test_rule_group.py b/test/e2e/tests/test_rule_group.py index c728ab8..a09e0ca 100644 --- a/test/e2e/tests/test_rule_group.py +++ b/test/e2e/tests/test_rule_group.py @@ -105,7 +105,7 @@ def test_crud(self, simple_rule_group): ref, _ = simple_rule_group time.sleep(CREATE_WAIT_SECONDS) - condition.assert_synced(ref) + condition.assert_ready(ref) cr = k8s.get_resource(ref) @@ -155,7 +155,7 @@ def nested_statement(self, nested_statement_rule_group): ref, _ = nested_statement_rule_group time.sleep(CREATE_WAIT_SECONDS) - condition.assert_synced(ref) + condition.assert_ready(ref) cr = k8s.get_resource(ref) diff --git a/test/e2e/tests/test_web_acl.py b/test/e2e/tests/test_web_acl.py index c9cd55c..3ab89fb 100644 --- a/test/e2e/tests/test_web_acl.py +++ b/test/e2e/tests/test_web_acl.py @@ -159,7 +159,7 @@ def test_crud(self, simple_web_acl): ref, _ = simple_web_acl time.sleep(CREATE_WAIT_SECONDS) - condition.assert_synced(ref) + condition.assert_ready(ref) cr = k8s.get_resource(ref) @@ -209,7 +209,7 @@ def nested_statement(self, nested_statement_web_acl): ref, _ = nested_statement_web_acl time.sleep(CREATE_WAIT_SECONDS) - condition.assert_synced(ref) + condition.assert_ready(ref) cr = k8s.get_resource(ref) @@ -245,7 +245,7 @@ def test_logging_configuration(self, web_acl_with_logging): ref, _ = web_acl_with_logging time.sleep(CREATE_WAIT_SECONDS) - condition.assert_synced(ref) + condition.assert_ready(ref) cr = k8s.get_resource(ref)