Skip to content

tests: Ready condition rename for wafv2-controller #45

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 wafv2-controller #45

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-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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/wafv2.services.k8s.aws_ipsets.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: ipsets.wafv2.services.k8s.aws
spec:
group: wafv2.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/wafv2.services.k8s.aws_rulegroups.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: rulegroups.wafv2.services.k8s.aws
spec:
group: wafv2.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/wafv2.services.k8s.aws_webacls.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: webacls.wafv2.services.k8s.aws
spec:
group: wafv2.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
@@ -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=
Expand Down Expand Up @@ -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=
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
2 changes: 1 addition & 1 deletion helm/crds/wafv2.services.k8s.aws_ipsets.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: ipsets.wafv2.services.k8s.aws
spec:
group: wafv2.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/wafv2.services.k8s.aws_rulegroups.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: rulegroups.wafv2.services.k8s.aws
spec:
group: wafv2.services.k8s.aws
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/wafv2.services.k8s.aws_webacls.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: webacls.wafv2.services.k8s.aws
spec:
group: wafv2.services.k8s.aws
Expand Down
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@62b132c217bd912960e268962664c545a6fa824d
acktest @ git+https://github.com/gustavodiaz7722/ack-test-infra.git@4a5c296da0fe386eadf95c242591ae4724cd0428
2 changes: 1 addition & 1 deletion test/e2e/tests/test_ip_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/tests/test_rule_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions test/e2e/tests/test_web_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down