diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index e221e29..183b11f 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:24:57Z" - build_hash: 6b4211163dcc34776b01da9a18217bac0f4103fd - go_version: go1.24.6 - version: v0.52.0 + build_date: "2025-09-25T04:53:22Z" + build_hash: 9c388d9668ea19d0b1b65566d492c4f67c6e64c8 + go_version: go1.24.7 + version: 9c388d9 api_directory_checksum: de00dc4f2bdf37664cff32d744f55f691fb6ecae api_version: v1alpha1 aws_sdk_go_version: 1.32.6 diff --git a/config/crd/bases/acmpca.services.k8s.aws_certificateauthorities.yaml b/config/crd/bases/acmpca.services.k8s.aws_certificateauthorities.yaml index 06aa564..9924cd5 100644 --- a/config/crd/bases/acmpca.services.k8s.aws_certificateauthorities.yaml +++ b/config/crd/bases/acmpca.services.k8s.aws_certificateauthorities.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: certificateauthorities.acmpca.services.k8s.aws spec: group: acmpca.services.k8s.aws diff --git a/config/crd/bases/acmpca.services.k8s.aws_certificateauthorityactivations.yaml b/config/crd/bases/acmpca.services.k8s.aws_certificateauthorityactivations.yaml index c4d0d29..efe358b 100644 --- a/config/crd/bases/acmpca.services.k8s.aws_certificateauthorityactivations.yaml +++ b/config/crd/bases/acmpca.services.k8s.aws_certificateauthorityactivations.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: certificateauthorityactivations.acmpca.services.k8s.aws spec: group: acmpca.services.k8s.aws diff --git a/config/crd/bases/acmpca.services.k8s.aws_certificates.yaml b/config/crd/bases/acmpca.services.k8s.aws_certificates.yaml index ed31b65..66c7728 100644 --- a/config/crd/bases/acmpca.services.k8s.aws_certificates.yaml +++ b/config/crd/bases/acmpca.services.k8s.aws_certificates.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: certificates.acmpca.services.k8s.aws spec: group: acmpca.services.k8s.aws diff --git a/go.mod b/go.mod index a33a557..e9b1341 100644 --- a/go.mod +++ b/go.mod @@ -89,3 +89,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 5e66f95..eca65ee 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.49.6 h1:yNldzF5kzLBRvKlKz1S0bkvc2+04R1kt13KfBWQBfFA= github.com/aws/aws-sdk-go v1.49.6/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU= @@ -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= diff --git a/helm/crds/acmpca.services.k8s.aws_certificateauthorities.yaml b/helm/crds/acmpca.services.k8s.aws_certificateauthorities.yaml index d0cc197..e8dd22a 100644 --- a/helm/crds/acmpca.services.k8s.aws_certificateauthorities.yaml +++ b/helm/crds/acmpca.services.k8s.aws_certificateauthorities.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: certificateauthorities.acmpca.services.k8s.aws spec: group: acmpca.services.k8s.aws diff --git a/helm/crds/acmpca.services.k8s.aws_certificateauthorityactivations.yaml b/helm/crds/acmpca.services.k8s.aws_certificateauthorityactivations.yaml index c4d0d29..efe358b 100644 --- a/helm/crds/acmpca.services.k8s.aws_certificateauthorityactivations.yaml +++ b/helm/crds/acmpca.services.k8s.aws_certificateauthorityactivations.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: certificateauthorityactivations.acmpca.services.k8s.aws spec: group: acmpca.services.k8s.aws diff --git a/helm/crds/acmpca.services.k8s.aws_certificates.yaml b/helm/crds/acmpca.services.k8s.aws_certificates.yaml index ed31b65..66c7728 100644 --- a/helm/crds/acmpca.services.k8s.aws_certificates.yaml +++ b/helm/crds/acmpca.services.k8s.aws_certificates.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: certificates.acmpca.services.k8s.aws spec: group: acmpca.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/certificate/references.go b/pkg/resource/certificate/references.go index 5ad2dd4..afa1a97 100644 --- a/pkg/resource/certificate/references.go +++ b/pkg/resource/certificate/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" @@ -146,8 +147,9 @@ func getReferencedResourceState_CertificateAuthority( } 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( "CertificateAuthority", namespace, name) @@ -158,14 +160,14 @@ func getReferencedResourceState_CertificateAuthority( "CertificateAuthority", 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( "CertificateAuthority", namespace, name) diff --git a/pkg/resource/certificate_authority_activation/references.go b/pkg/resource/certificate_authority_activation/references.go index dba9e92..5b6d503 100644 --- a/pkg/resource/certificate_authority_activation/references.go +++ b/pkg/resource/certificate_authority_activation/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_CertificateAuthority( } 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( "CertificateAuthority", namespace, name) @@ -144,14 +146,14 @@ func getReferencedResourceState_CertificateAuthority( "CertificateAuthority", 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( "CertificateAuthority", namespace, name) diff --git a/test/e2e/requirements.txt b/test/e2e/requirements.txt index 5c04eea..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@26ff5ff62bfef2177ff18b9fc26c6289f01181c9 +acktest @ git+https://github.com/gustavodiaz7722/ack-test-infra.git@4a5c296da0fe386eadf95c242591ae4724cd0428 diff --git a/test/e2e/tests/test_ca_hierarchy.py b/test/e2e/tests/test_ca_hierarchy.py index 5180ce5..410b850 100644 --- a/test/e2e/tests/test_ca_hierarchy.py +++ b/test/e2e/tests/test_ca_hierarchy.py @@ -167,7 +167,7 @@ def certificate_authority_hierarchy( for resource in resource_data: logging.info(resource) k8s.create_custom_resource(references[i], resource) - assert k8s.wait_on_condition(references[i], "ACK.ResourceSynced", "True", wait_periods=15) + assert k8s.wait_on_condition(references[i], "Ready", "True", wait_periods=15) i += 1 time.sleep(180) @@ -181,7 +181,7 @@ def certificate_authority_hierarchy( end_entity_cert_cr = k8s.wait_resource_consumed_by_controller(end_entity_cert_ref) for ref in references: - assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=15) + assert k8s.wait_on_condition(ref, "Ready", "True", wait_periods=15) assert ca_cr is not None assert k8s.get_resource_exists(ca_ref)