From 0b95cdf1e732dbf1e9885e40756e6717a18bc6ff Mon Sep 17 00:00:00 2001 From: Gustavo Diaz Date: Thu, 25 Sep 2025 06:06:19 +0000 Subject: [PATCH 1/3] Ready condition migration for sagemaker controller --- apis/v1alpha1/ack-generate-metadata.yaml | 8 ++++---- .../bases/sagemaker.services.k8s.aws_apps.yaml | 2 +- ...rvices.k8s.aws_dataqualityjobdefinitions.yaml | 2 +- .../sagemaker.services.k8s.aws_domains.yaml | 2 +- ...gemaker.services.k8s.aws_endpointconfigs.yaml | 2 +- .../sagemaker.services.k8s.aws_endpoints.yaml | 2 +- ...sagemaker.services.k8s.aws_featuregroups.yaml | 2 +- ...ervices.k8s.aws_hyperparametertuningjobs.yaml | 2 +- ...ker.services.k8s.aws_inferencecomponents.yaml | 2 +- .../sagemaker.services.k8s.aws_labelingjobs.yaml | 2 +- ...services.k8s.aws_modelbiasjobdefinitions.yaml | 2 +- ...8s.aws_modelexplainabilityjobdefinitions.yaml | 2 +- ...aker.services.k8s.aws_modelpackagegroups.yaml | 2 +- ...sagemaker.services.k8s.aws_modelpackages.yaml | 2 +- ...vices.k8s.aws_modelqualityjobdefinitions.yaml | 2 +- .../bases/sagemaker.services.k8s.aws_models.yaml | 2 +- ...ker.services.k8s.aws_monitoringschedules.yaml | 2 +- ...k8s.aws_notebookinstancelifecycleconfigs.yaml | 2 +- ...maker.services.k8s.aws_notebookinstances.yaml | 2 +- ...aker.services.k8s.aws_pipelineexecutions.yaml | 2 +- .../sagemaker.services.k8s.aws_pipelines.yaml | 2 +- ...agemaker.services.k8s.aws_processingjobs.yaml | 2 +- .../sagemaker.services.k8s.aws_trainingjobs.yaml | 2 +- ...sagemaker.services.k8s.aws_transformjobs.yaml | 2 +- .../sagemaker.services.k8s.aws_userprofiles.yaml | 2 +- go.mod | 2 ++ go.sum | 4 ++-- helm/crds/sagemaker.services.k8s.aws_apps.yaml | 2 +- ...rvices.k8s.aws_dataqualityjobdefinitions.yaml | 2 +- .../crds/sagemaker.services.k8s.aws_domains.yaml | 2 +- ...gemaker.services.k8s.aws_endpointconfigs.yaml | 2 +- .../sagemaker.services.k8s.aws_endpoints.yaml | 2 +- ...sagemaker.services.k8s.aws_featuregroups.yaml | 2 +- ...ervices.k8s.aws_hyperparametertuningjobs.yaml | 2 +- ...ker.services.k8s.aws_inferencecomponents.yaml | 2 +- .../sagemaker.services.k8s.aws_labelingjobs.yaml | 2 +- ...services.k8s.aws_modelbiasjobdefinitions.yaml | 2 +- ...8s.aws_modelexplainabilityjobdefinitions.yaml | 2 +- ...aker.services.k8s.aws_modelpackagegroups.yaml | 2 +- ...sagemaker.services.k8s.aws_modelpackages.yaml | 2 +- ...vices.k8s.aws_modelqualityjobdefinitions.yaml | 2 +- helm/crds/sagemaker.services.k8s.aws_models.yaml | 2 +- ...ker.services.k8s.aws_monitoringschedules.yaml | 2 +- ...k8s.aws_notebookinstancelifecycleconfigs.yaml | 2 +- ...maker.services.k8s.aws_notebookinstances.yaml | 2 +- ...aker.services.k8s.aws_pipelineexecutions.yaml | 2 +- .../sagemaker.services.k8s.aws_pipelines.yaml | 2 +- ...agemaker.services.k8s.aws_processingjobs.yaml | 2 +- .../sagemaker.services.k8s.aws_trainingjobs.yaml | 2 +- ...sagemaker.services.k8s.aws_transformjobs.yaml | 2 +- .../sagemaker.services.k8s.aws_userprofiles.yaml | 2 +- helm/crds/services.k8s.aws_adoptedresources.yaml | 2 +- helm/crds/services.k8s.aws_fieldexports.yaml | 2 +- test/e2e/requirements.txt | 2 +- test/e2e/tests/test_adopt_endpoint.py | 2 +- test/e2e/tests/test_adopt_model_package.py | 2 +- test/e2e/tests/test_endpoint.py | 12 ++++++------ test/e2e/tests/test_feature_group.py | 2 +- test/e2e/tests/test_hpo.py | 6 +++--- test/e2e/tests/test_inference_component.py | 16 ++++++++-------- test/e2e/tests/test_labelingjob.py | 2 +- test/e2e/tests/test_model_package.py | 10 +++++----- test/e2e/tests/test_model_package_group.py | 2 +- test/e2e/tests/test_monitoring_schedule.py | 4 ++-- test/e2e/tests/test_notebook_instance.py | 6 +++--- test/e2e/tests/test_pipeline.py | 4 ++-- test/e2e/tests/test_pipeline_execution.py | 6 +++--- test/e2e/tests/test_processingjob.py | 6 +++--- test/e2e/tests/test_trainingjob.py | 6 +++--- test/e2e/tests/test_trainingjob_debugger.py | 6 +++--- test/e2e/tests/test_transformjob.py | 6 +++--- 71 files changed, 108 insertions(+), 106 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 338a2b2e..93a830fd 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:39:31Z" - build_hash: 5bf1e456e1dfc638d47ab492376335f528c0f455 - go_version: go1.25.0 - version: v0.52.0-1-g5bf1e45 + build_date: "2025-09-25T06:05:12Z" + build_hash: 9c388d9668ea19d0b1b65566d492c4f67c6e64c8 + go_version: go1.24.7 + version: 9c388d9 api_directory_checksum: 0b6625eb2e0b359687d13920cd0bb353a21e0e19 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/config/crd/bases/sagemaker.services.k8s.aws_apps.yaml b/config/crd/bases/sagemaker.services.k8s.aws_apps.yaml index ded223bd..21d899da 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_apps.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_apps.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: apps.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml index da1d244e..51858f5d 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.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: dataqualityjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_domains.yaml b/config/crd/bases/sagemaker.services.k8s.aws_domains.yaml index c22ac85a..31bcf4d8 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_domains.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_domains.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: domains.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml index 3cfef099..6726ed68 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.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: endpointconfigs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml b/config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml index a11bb042..4a4803cc 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_endpoints.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: endpoints.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml b/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml index 3999f26b..58259aca 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.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: featuregroups.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml index cebc2e5a..7863b3d3 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.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: hyperparametertuningjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_inferencecomponents.yaml b/config/crd/bases/sagemaker.services.k8s.aws_inferencecomponents.yaml index 94b43623..fbd1d09a 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_inferencecomponents.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_inferencecomponents.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: inferencecomponents.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_labelingjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_labelingjobs.yaml index bc92b22f..ac995a8f 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_labelingjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_labelingjobs.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: labelingjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml index 304bc5da..85581ad3 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.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: modelbiasjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml index 76e30d6d..fa094e9b 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.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: modelexplainabilityjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml index 46379668..6400cca1 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.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: modelpackagegroups.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml index c5ac190d..582121a6 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.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: modelpackages.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml index 6d72c2e7..4222cb12 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.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: modelqualityjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_models.yaml b/config/crd/bases/sagemaker.services.k8s.aws_models.yaml index 9caecf22..3805e7a5 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_models.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_models.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: models.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml b/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml index d2f3d6e9..33e62e2c 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.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: monitoringschedules.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml index 14990118..4f468c9e 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.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: notebookinstancelifecycleconfigs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml index bc6c8d09..072fb7cf 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.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: notebookinstances.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_pipelineexecutions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_pipelineexecutions.yaml index de93945e..23028dfe 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_pipelineexecutions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_pipelineexecutions.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: pipelineexecutions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_pipelines.yaml b/config/crd/bases/sagemaker.services.k8s.aws_pipelines.yaml index c69e8e69..2ddf416a 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_pipelines.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_pipelines.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: pipelines.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml index a3ff70b9..aacf1f40 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.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: processingjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml index 60ea2dac..21d6463a 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.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: trainingjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml index 43ae3ba5..082e604d 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.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: transformjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/config/crd/bases/sagemaker.services.k8s.aws_userprofiles.yaml b/config/crd/bases/sagemaker.services.k8s.aws_userprofiles.yaml index 813f57b5..36c6d5de 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_userprofiles.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_userprofiles.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: userprofiles.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/go.mod b/go.mod index a3d12f48..95823a9e 100644 --- a/go.mod +++ b/go.mod @@ -91,3 +91,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 6a99057a..552495cb 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.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= 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/sagemaker.services.k8s.aws_apps.yaml b/helm/crds/sagemaker.services.k8s.aws_apps.yaml index ded223bd..21d899da 100644 --- a/helm/crds/sagemaker.services.k8s.aws_apps.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_apps.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: apps.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml index da1d244e..51858f5d 100644 --- a/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.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: dataqualityjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_domains.yaml b/helm/crds/sagemaker.services.k8s.aws_domains.yaml index b8356954..1d248664 100644 --- a/helm/crds/sagemaker.services.k8s.aws_domains.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_domains.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: domains.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml b/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml index 6ed06535..d656abcb 100644 --- a/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.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: endpointconfigs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_endpoints.yaml b/helm/crds/sagemaker.services.k8s.aws_endpoints.yaml index a11bb042..4a4803cc 100644 --- a/helm/crds/sagemaker.services.k8s.aws_endpoints.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_endpoints.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: endpoints.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml b/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml index 99958054..69cde422 100644 --- a/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_featuregroups.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: featuregroups.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml index c99ec6bb..1e6742bd 100644 --- a/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.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: hyperparametertuningjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_inferencecomponents.yaml b/helm/crds/sagemaker.services.k8s.aws_inferencecomponents.yaml index 94b43623..fbd1d09a 100644 --- a/helm/crds/sagemaker.services.k8s.aws_inferencecomponents.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_inferencecomponents.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: inferencecomponents.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_labelingjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_labelingjobs.yaml index 97cfe08b..f30442f2 100644 --- a/helm/crds/sagemaker.services.k8s.aws_labelingjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_labelingjobs.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: labelingjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml index 304bc5da..85581ad3 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.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: modelbiasjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml index 76e30d6d..fa094e9b 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.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: modelexplainabilityjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.yaml b/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.yaml index 46379668..6400cca1 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.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: modelpackagegroups.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_modelpackages.yaml b/helm/crds/sagemaker.services.k8s.aws_modelpackages.yaml index 48403f82..92ccf7bf 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelpackages.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelpackages.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: modelpackages.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml index 6d72c2e7..4222cb12 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.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: modelqualityjobdefinitions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_models.yaml b/helm/crds/sagemaker.services.k8s.aws_models.yaml index 9caecf22..3805e7a5 100644 --- a/helm/crds/sagemaker.services.k8s.aws_models.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_models.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: models.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.yaml b/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.yaml index d2f3d6e9..33e62e2c 100644 --- a/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.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: monitoringschedules.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml b/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml index 14990118..4f468c9e 100644 --- a/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.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: notebookinstancelifecycleconfigs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_notebookinstances.yaml b/helm/crds/sagemaker.services.k8s.aws_notebookinstances.yaml index bc6c8d09..072fb7cf 100644 --- a/helm/crds/sagemaker.services.k8s.aws_notebookinstances.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_notebookinstances.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: notebookinstances.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_pipelineexecutions.yaml b/helm/crds/sagemaker.services.k8s.aws_pipelineexecutions.yaml index de93945e..23028dfe 100644 --- a/helm/crds/sagemaker.services.k8s.aws_pipelineexecutions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_pipelineexecutions.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: pipelineexecutions.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_pipelines.yaml b/helm/crds/sagemaker.services.k8s.aws_pipelines.yaml index c69e8e69..2ddf416a 100644 --- a/helm/crds/sagemaker.services.k8s.aws_pipelines.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_pipelines.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: pipelines.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_processingjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_processingjobs.yaml index 42cd5d25..1eabfdcb 100644 --- a/helm/crds/sagemaker.services.k8s.aws_processingjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_processingjobs.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: processingjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_trainingjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_trainingjobs.yaml index 5d94f99e..832cbcc6 100644 --- a/helm/crds/sagemaker.services.k8s.aws_trainingjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_trainingjobs.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: trainingjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_transformjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_transformjobs.yaml index 425e3d04..045cc11a 100644 --- a/helm/crds/sagemaker.services.k8s.aws_transformjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_transformjobs.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: transformjobs.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/sagemaker.services.k8s.aws_userprofiles.yaml b/helm/crds/sagemaker.services.k8s.aws_userprofiles.yaml index 813f57b5..36c6d5de 100644 --- a/helm/crds/sagemaker.services.k8s.aws_userprofiles.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_userprofiles.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: userprofiles.sagemaker.services.k8s.aws spec: group: sagemaker.services.k8s.aws diff --git a/helm/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml index b7be3224..d6cdd10f 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 49b4f383..6e2c61e6 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/test/e2e/requirements.txt b/test/e2e/requirements.txt index 15109257..3eae4302 100644 --- a/test/e2e/requirements.txt +++ b/test/e2e/requirements.txt @@ -1,4 +1,4 @@ -acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@66d07f4daa2ce12d92f07cb332d5342a0aea4feb +acktest @ git+https://github.com/gustavodiaz7722/ack-test-infra.git@4a5c296da0fe386eadf95c242591ae4724cd0428 pytest==8.0.2 black==20.8b1 flaky==3.7.0 diff --git a/test/e2e/tests/test_adopt_endpoint.py b/test/e2e/tests/test_adopt_endpoint.py index 9d8ad500..c529e309 100644 --- a/test/e2e/tests/test_adopt_endpoint.py +++ b/test/e2e/tests/test_adopt_endpoint.py @@ -244,7 +244,7 @@ def test_smoke(self, sdk_endpoint, adopted_endpoint): cfg.ENDPOINT_STATUS_INSERVICE, ) assert k8s.wait_on_condition( - endpoint_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + endpoint_reference, ack_condition.CONDITION_TYPE_READY, "True" ) for cr in (model_reference, config_reference, endpoint_reference): diff --git a/test/e2e/tests/test_adopt_model_package.py b/test/e2e/tests/test_adopt_model_package.py index 8aaa7e5a..8c5a2d55 100644 --- a/test/e2e/tests/test_adopt_model_package.py +++ b/test/e2e/tests/test_adopt_model_package.py @@ -233,7 +233,7 @@ def test_smoke(self, sdk_model_package, adopted_model_package): cfg.JOB_STATUS_COMPLETED, ) assert k8s.wait_on_condition( - model_package_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + model_package_reference, ack_condition.CONDITION_TYPE_READY, "True" ) for cr in (model_package_reference, model_package_group_reference): diff --git a/test/e2e/tests/test_endpoint.py b/test/e2e/tests/test_endpoint.py index 2c3d73e7..7f38aa24 100644 --- a/test/e2e/tests/test_endpoint.py +++ b/test/e2e/tests/test_endpoint.py @@ -231,12 +231,12 @@ def create_endpoint_test(self, xgboost_endpoint): # endpoint transitions Creating -> InService state assert_endpoint_status_in_sync(endpoint_name, reference, cfg.ENDPOINT_STATUS_CREATING) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert_endpoint_status_in_sync(endpoint_name, reference, cfg.ENDPOINT_STATUS_INSERVICE) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) @@ -258,7 +258,7 @@ def update_endpoint_failed_test(self, single_variant_config, faulty_config, xgbo cfg.ENDPOINT_STATUS_UPDATING, ) assert k8s.wait_on_condition( - endpoint_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + endpoint_reference, ack_condition.CONDITION_TYPE_READY, "False" ) endpoint_resource = k8s.get_resource(endpoint_reference) annotations = endpoint_resource["metadata"].get("annotations", None) @@ -272,7 +272,7 @@ def update_endpoint_failed_test(self, single_variant_config, faulty_config, xgbo ) assert k8s.wait_on_condition( - endpoint_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + endpoint_reference, ack_condition.CONDITION_TYPE_READY, "False" ) (_, old_config_resource) = single_variant_config @@ -310,7 +310,7 @@ def update_endpoint_successful_test(self, multi_variant_config, xgboost_endpoint ) assert k8s.wait_on_condition( - endpoint_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + endpoint_reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert ( k8s.get_resource_condition(endpoint_reference, ack_condition.CONDITION_TYPE_TERMINAL) @@ -327,7 +327,7 @@ def update_endpoint_successful_test(self, multi_variant_config, xgboost_endpoint cfg.ENDPOINT_STATUS_INSERVICE, ) assert k8s.wait_on_condition( - endpoint_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + endpoint_reference, ack_condition.CONDITION_TYPE_READY, "True" ) assert ( k8s.get_resource_condition(endpoint_reference, ack_condition.CONDITION_TYPE_TERMINAL) diff --git a/test/e2e/tests/test_feature_group.py b/test/e2e/tests/test_feature_group.py index a25ce24b..30a770de 100644 --- a/test/e2e/tests/test_feature_group.py +++ b/test/e2e/tests/test_feature_group.py @@ -144,7 +144,7 @@ def test_create_feature_group(self, feature_group): ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) diff --git a/test/e2e/tests/test_hpo.py b/test/e2e/tests/test_hpo.py index df139e9d..0a43cf43 100644 --- a/test/e2e/tests/test_hpo.py +++ b/test/e2e/tests/test_hpo.py @@ -134,7 +134,7 @@ def test_stopped(self, xgboost_hpojob): assert k8s.get_resource_arn(resource) == hpo_sm_desc["HyperParameterTuningJobArn"] assert hpo_sm_desc["HyperParameterTuningJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_hpo_status_in_sync(hpo_job_name, reference, cfg.JOB_STATUS_INPROGRESS) @@ -161,12 +161,12 @@ def test_completed(self, xgboost_hpojob): assert hpo_sm_desc["HyperParameterTuningJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_hpo_status_in_sync(hpo_job_name, reference, cfg.JOB_STATUS_COMPLETED) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) diff --git a/test/e2e/tests/test_inference_component.py b/test/e2e/tests/test_inference_component.py index 157e37b8..2c5f9694 100644 --- a/test/e2e/tests/test_inference_component.py +++ b/test/e2e/tests/test_inference_component.py @@ -127,12 +127,12 @@ def endpoint(name_suffix, endpoint_config): # endpoint transitions Creating -> InService state assert_endpoint_status_in_sync(endpoint_name, endpoint_reference, cfg.ENDPOINT_STATUS_CREATING) assert k8s.wait_on_condition( - endpoint_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + endpoint_reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert_endpoint_status_in_sync(endpoint_name, endpoint_reference, cfg.ENDPOINT_STATUS_INSERVICE) assert k8s.wait_on_condition( - endpoint_reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + endpoint_reference, ack_condition.CONDITION_TYPE_READY, "True" ) yield (endpoint_reference, endpoint_resource) @@ -226,14 +226,14 @@ def create_inference_component_test(self, inference_component): inference_component_name, reference, cfg.INFERENCE_COMPONENT_STATUS_CREATING ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert_inference_component_status_in_sync( inference_component_name, reference, cfg.INFERENCE_COMPONENT_STATUS_INSERVICE ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) @@ -256,7 +256,7 @@ def update_inference_component_failed_test(self, inference_component, faulty_mod ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert k8s.get_resource_condition(reference, ack_condition.CONDITION_TYPE_TERMINAL) is None resource = k8s.get_resource(reference) @@ -268,7 +268,7 @@ def update_inference_component_failed_test(self, inference_component, faulty_mod ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert k8s.assert_condition_state_message( @@ -305,7 +305,7 @@ def update_inference_component_successful_test(self, inference_component, xgboos ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert k8s.get_resource_condition(reference, ack_condition.CONDITION_TYPE_TERMINAL) is None resource = k8s.get_resource(reference) @@ -316,7 +316,7 @@ def update_inference_component_successful_test(self, inference_component, xgboos cfg.INFERENCE_COMPONENT_STATUS_INSERVICE, ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) assert k8s.get_resource_condition(reference, ack_condition.CONDITION_TYPE_TERMINAL) is None resource = k8s.get_resource(reference) diff --git a/test/e2e/tests/test_labelingjob.py b/test/e2e/tests/test_labelingjob.py index 312bb3c6..9f947ced 100644 --- a/test/e2e/tests/test_labelingjob.py +++ b/test/e2e/tests/test_labelingjob.py @@ -134,7 +134,7 @@ def test_stopped(self, image_labeling_job): assert k8s.get_resource_arn(resource) == labeling_job_desc["LabelingJobArn"] assert labeling_job_desc["LabelingJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_labeling_status_in_sync( diff --git a/test/e2e/tests/test_model_package.py b/test/e2e/tests/test_model_package.py index c163ef8f..5778546a 100644 --- a/test/e2e/tests/test_model_package.py +++ b/test/e2e/tests/test_model_package.py @@ -186,14 +186,14 @@ def test_unversioned_model_package_completed(self, xgboost_unversioned_model_pac model_package_name, reference, cfg.JOB_STATUS_INPROGRESS ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_model_package_status_in_sync( model_package_name, reference, cfg.JOB_STATUS_COMPLETED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) @@ -226,14 +226,14 @@ def test_versioned_model_package_completed(self, xgboost_versioned_model_package model_package_name, reference, cfg.JOB_STATUS_INPROGRESS ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_model_package_status_in_sync( model_package_name, reference, cfg.JOB_STATUS_COMPLETED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) # Update the resource @@ -249,7 +249,7 @@ def test_versioned_model_package_completed(self, xgboost_versioned_model_package model_package_name, reference, cfg.JOB_STATUS_COMPLETED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) model_package_desc = get_sagemaker_model_package(model_package_name) diff --git a/test/e2e/tests/test_model_package_group.py b/test/e2e/tests/test_model_package_group.py index 76443ebe..44c26069 100644 --- a/test/e2e/tests/test_model_package_group.py +++ b/test/e2e/tests/test_model_package_group.py @@ -125,7 +125,7 @@ def test_create_model_package_group(self, xgboost_model_package_group): model_package_group_name, reference, cfg.JOB_STATUS_COMPLETED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) diff --git a/test/e2e/tests/test_monitoring_schedule.py b/test/e2e/tests/test_monitoring_schedule.py index d3a0604b..b23d7573 100644 --- a/test/e2e/tests/test_monitoring_schedule.py +++ b/test/e2e/tests/test_monitoring_schedule.py @@ -164,7 +164,7 @@ def test_smoke(self, sagemaker_client, xgboost_churn_data_quality_monitoring_sch sagemaker_client, monitoring_schedule_name, reference, self.STATUS_SCHEDULED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) @@ -183,7 +183,7 @@ def test_smoke(self, sagemaker_client, xgboost_churn_data_quality_monitoring_sch sagemaker_client, monitoring_schedule_name, reference, self.STATUS_SCHEDULED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) latest_schedule = get_sagemaker_monitoring_schedule( diff --git a/test/e2e/tests/test_notebook_instance.py b/test/e2e/tests/test_notebook_instance.py index 6627f0f3..a0b96751 100644 --- a/test/e2e/tests/test_notebook_instance.py +++ b/test/e2e/tests/test_notebook_instance.py @@ -148,14 +148,14 @@ def create_notebook_test(self, notebook_instance): assert notebook_description["NotebookInstanceStatus"] == "Pending" assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_notebook_status_in_sync(notebook_instance_name, reference, "Pending") # wait for the resource to go to the InService state and make sure the operator is synced with sagemaker. self._assert_notebook_status_in_sync(notebook_instance_name, reference, "InService") assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) def update_notebook_test(self, notebook_instance): @@ -185,7 +185,7 @@ def update_notebook_test(self, notebook_instance): # wait for the resource to go to the InService state and make sure the operator is synced with sagemaker. self._assert_notebook_status_in_sync(notebook_instance_name, reference, "InService") assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) notebook_instance_desc = get_notebook_instance(notebook_instance_name) diff --git a/test/e2e/tests/test_pipeline.py b/test/e2e/tests/test_pipeline.py index 41302dd5..0e295b73 100644 --- a/test/e2e/tests/test_pipeline.py +++ b/test/e2e/tests/test_pipeline.py @@ -141,7 +141,7 @@ def test_pipeline_succeeded(self, pipeline): self._assert_pipeline_status_in_sync(pipeline_arn, reference, "Active") assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) # Update the resource @@ -153,7 +153,7 @@ def test_pipeline_succeeded(self, pipeline): self._assert_pipeline_status_in_sync(pipeline_arn, reference, "Active") assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) pipeline_desc = get_sagemaker_pipeline(pipeline_name) diff --git a/test/e2e/tests/test_pipeline_execution.py b/test/e2e/tests/test_pipeline_execution.py index 640abc0a..b6c153d7 100644 --- a/test/e2e/tests/test_pipeline_execution.py +++ b/test/e2e/tests/test_pipeline_execution.py @@ -180,7 +180,7 @@ def test_pipeline_execution_succeeded(self, pipeline_execution): ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) # Update the resource @@ -194,7 +194,7 @@ def test_pipeline_execution_succeeded(self, pipeline_execution): pipeline_execution_arn, reference, cfg.JOB_STATUS_EXECUTING ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) pipeline_execution_desc = get_sagemaker_pipeline_execution(pipeline_execution_arn) @@ -215,7 +215,7 @@ def test_pipeline_execution_succeeded(self, pipeline_execution): pipeline_execution_arn, reference, cfg.JOB_STATUS_SUCCEEDED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) # Check that you can delete a completed resource from k8s diff --git a/test/e2e/tests/test_processingjob.py b/test/e2e/tests/test_processingjob.py index 0f115f90..cda56d75 100644 --- a/test/e2e/tests/test_processingjob.py +++ b/test/e2e/tests/test_processingjob.py @@ -134,7 +134,7 @@ def test_stopped(self, kmeans_processing_job): assert k8s.get_resource_arn(resource) == processing_job_desc["ProcessingJobArn"] assert processing_job_desc["ProcessingJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_processing_status_in_sync( @@ -163,14 +163,14 @@ def test_completed(self, kmeans_processing_job): assert processing_job_desc["ProcessingJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_processing_status_in_sync( processing_job_name, reference, cfg.JOB_STATUS_COMPLETED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) diff --git a/test/e2e/tests/test_trainingjob.py b/test/e2e/tests/test_trainingjob.py index eb41557e..174dcde1 100644 --- a/test/e2e/tests/test_trainingjob.py +++ b/test/e2e/tests/test_trainingjob.py @@ -72,7 +72,7 @@ def test_stopped(self, xgboost_training_job): assert k8s.get_resource_arn(resource) == training_job_desc["TrainingJobArn"] assert training_job_desc["TrainingJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert_training_status_in_sync(training_job_name, reference, cfg.JOB_STATUS_INPROGRESS) @@ -100,12 +100,12 @@ def test_completed(self, xgboost_training_job): assert training_job_desc["TrainingJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) assert_training_status_in_sync(training_job_name, reference, cfg.JOB_STATUS_COMPLETED) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) # model artifact URL is populated diff --git a/test/e2e/tests/test_trainingjob_debugger.py b/test/e2e/tests/test_trainingjob_debugger.py index 8ac5b079..e538f346 100644 --- a/test/e2e/tests/test_trainingjob_debugger.py +++ b/test/e2e/tests/test_trainingjob_debugger.py @@ -148,7 +148,7 @@ def update_debugger_trainingjob(self, xgboost_training_job_debugger): assert training_job_desc["TrainingJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) spec["spec"]["profilerConfig"]["profilingIntervalInMilliseconds"] = NEW_PROFILER_INTERVAL @@ -156,7 +156,7 @@ def update_debugger_trainingjob(self, xgboost_training_job_debugger): assert_training_status_in_sync(training_job_name, reference, cfg.JOB_STATUS_COMPLETED) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) # Assert debugger rule evaluation completed @@ -169,7 +169,7 @@ def update_debugger_trainingjob(self, xgboost_training_job_debugger): training_job_name, "ProfilerRule", reference, cfg.RULE_STATUS_COMPLETED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) # Check if the update worked. diff --git a/test/e2e/tests/test_transformjob.py b/test/e2e/tests/test_transformjob.py index 2e219a4b..6124457e 100644 --- a/test/e2e/tests/test_transformjob.py +++ b/test/e2e/tests/test_transformjob.py @@ -168,7 +168,7 @@ def test_stopped(self, xgboost_transformjob): assert k8s.get_resource_arn(resource) == transform_sm_desc["TransformJobArn"] assert transform_sm_desc["TransformJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_transform_status_in_sync( @@ -197,14 +197,14 @@ def test_completed(self, xgboost_transformjob): assert transform_sm_desc["TransformJobStatus"] == cfg.JOB_STATUS_INPROGRESS assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "False" + reference, ack_condition.CONDITION_TYPE_READY, "False" ) self._assert_transform_status_in_sync( transform_job_name, reference, cfg.JOB_STATUS_COMPLETED ) assert k8s.wait_on_condition( - reference, ack_condition.CONDITION_TYPE_RESOURCE_SYNCED, "True" + reference, ack_condition.CONDITION_TYPE_READY, "True" ) resource_tags = resource["spec"].get("tags", None) From 3b748cdde13332f6c4c61a6cadacad8724e98265 Mon Sep 17 00:00:00 2001 From: Gustavo Diaz Date: Thu, 25 Sep 2025 18:28:33 +0000 Subject: [PATCH 2/3] Fix terminal assertion for Ready condition --- test/e2e/tests/test_endpoint.py | 7 +------ test/e2e/tests/test_inference_component.py | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/test/e2e/tests/test_endpoint.py b/test/e2e/tests/test_endpoint.py index 7f38aa24..019c5fda 100644 --- a/test/e2e/tests/test_endpoint.py +++ b/test/e2e/tests/test_endpoint.py @@ -277,12 +277,7 @@ def update_endpoint_failed_test(self, single_variant_config, faulty_config, xgbo (_, old_config_resource) = single_variant_config current_config_name = old_config_resource["spec"].get("endpointConfigName", None) - assert k8s.assert_condition_state_message( - endpoint_reference, - ack_condition.CONDITION_TYPE_TERMINAL, - "True", - FAIL_UPDATE_ERROR_MESSAGE + current_config_name, - ) + ack_condition.assert_terminal(endpoint_reference, FAIL_UPDATE_ERROR_MESSAGE + current_config_name) endpoint_resource = k8s.get_resource(endpoint_reference) assert endpoint_resource["status"].get("failureReason", None) is not None diff --git a/test/e2e/tests/test_inference_component.py b/test/e2e/tests/test_inference_component.py index 2c5f9694..a429d930 100644 --- a/test/e2e/tests/test_inference_component.py +++ b/test/e2e/tests/test_inference_component.py @@ -271,12 +271,7 @@ def update_inference_component_failed_test(self, inference_component, faulty_mod reference, ack_condition.CONDITION_TYPE_READY, "False" ) - assert k8s.assert_condition_state_message( - reference, - ack_condition.CONDITION_TYPE_TERMINAL, - "True", - FAIL_UPDATE_ERROR_MESSAGE, - ) + ack_condition.assert_terminal(reference, FAIL_UPDATE_ERROR_MESSAGE) resource = k8s.get_resource(reference) assert resource["status"].get("failureReason", None) is not None From 5e7fffb7a21e5e58753a3bcd789091e192723f85 Mon Sep 17 00:00:00 2001 From: Gustavo Diaz Date: Fri, 26 Sep 2025 20:00:32 +0000 Subject: [PATCH 3/3] Update code gen --- apis/v1alpha1/ack-generate-metadata.yaml | 8 +++--- apis/v1alpha1/feature_group.go | 4 +-- apis/v1alpha1/generator.yaml | 6 +++++ apis/v1alpha1/zz_generated.deepcopy.go | 2 +- ...emaker.services.k8s.aws_featuregroups.yaml | 2 +- generator.yaml | 6 +++++ ...emaker.services.k8s.aws_featuregroups.yaml | 2 +- pkg/resource/feature_group/delta.go | 25 ------------------- pkg/resource/feature_group/sdk.go | 2 +- 9 files changed, 22 insertions(+), 35 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 93a830fd..270d3369 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2025-09-25T06:05:12Z" + build_date: "2025-09-26T19:55:09Z" build_hash: 9c388d9668ea19d0b1b65566d492c4f67c6e64c8 go_version: go1.24.7 - version: 9c388d9 -api_directory_checksum: 0b6625eb2e0b359687d13920cd0bb353a21e0e19 + version: 9c388d9-dirty +api_directory_checksum: d579f6559cf90abb8366b7f63f5e7d2d3f80c293 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 generator_config_info: - file_checksum: 70c9edbf252f449db6a130c3cc7272a847aaaafd + file_checksum: c6a0df1990f37cc164a5ba92ab5e17f9c4b6b081 original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/feature_group.go b/apis/v1alpha1/feature_group.go index 7a13912f..cc63663c 100644 --- a/apis/v1alpha1/feature_group.go +++ b/apis/v1alpha1/feature_group.go @@ -122,8 +122,8 @@ type FeatureGroupSpec struct { // Regex Pattern: `^arn:aws[a-z\-]*:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$` RoleARN *string `json:"roleARN,omitempty"` // Tags used to identify Features in each FeatureGroup. - Tags []*Tag `json:"tags,omitempty"` - ThroughputConfig *ThroughputConfig `json:"throughputConfig,omitempty"` + Tags []*Tag `json:"tags,omitempty"` + ThroughputConfig *ThroughputConfigDescription `json:"throughputConfig,omitempty"` } // FeatureGroupStatus defines the observed state of FeatureGroup diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index f05db345..95e34f92 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -255,6 +255,12 @@ resources: from: operation: DescribeFeatureGroup path: FeatureGroupStatus + ThroughputConfig: + from: + operation: DescribeFeatureGroup + path: ThroughputConfig + compare: + is_ignored: true OfflineStoreConfig.DisableGlueTableCreation: late_initialize: min_backoff_seconds: 5 diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index 5948a666..1171d5bd 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -5403,7 +5403,7 @@ func (in *FeatureGroupSpec) DeepCopyInto(out *FeatureGroupSpec) { } if in.ThroughputConfig != nil { in, out := &in.ThroughputConfig, &out.ThroughputConfig - *out = new(ThroughputConfig) + *out = new(ThroughputConfigDescription) (*in).DeepCopyInto(*out) } } diff --git a/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml b/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml index 58259aca..36b70eef 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml @@ -256,7 +256,7 @@ spec: type: array throughputConfig: description: |- - Used to set feature group throughput configuration. There are two modes: + Active throughput configuration of the feature group. There are two modes: ON_DEMAND and PROVISIONED. With on-demand mode, you are charged for data reads and writes that your application performs on your feature group. You do not need to specify read and write throughput because Feature Store accommodates diff --git a/generator.yaml b/generator.yaml index f05db345..95e34f92 100644 --- a/generator.yaml +++ b/generator.yaml @@ -255,6 +255,12 @@ resources: from: operation: DescribeFeatureGroup path: FeatureGroupStatus + ThroughputConfig: + from: + operation: DescribeFeatureGroup + path: ThroughputConfig + compare: + is_ignored: true OfflineStoreConfig.DisableGlueTableCreation: late_initialize: min_backoff_seconds: 5 diff --git a/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml b/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml index 69cde422..eee0fbad 100644 --- a/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml @@ -256,7 +256,7 @@ spec: type: array throughputConfig: description: |- - Used to set feature group throughput configuration. There are two modes: + Active throughput configuration of the feature group. There are two modes: ON_DEMAND and PROVISIONED. With on-demand mode, you are charged for data reads and writes that your application performs on your feature group. You do not need to specify read and write throughput because Feature Store accommodates diff --git a/pkg/resource/feature_group/delta.go b/pkg/resource/feature_group/delta.go index a3e8b46d..c381c2da 100644 --- a/pkg/resource/feature_group/delta.go +++ b/pkg/resource/feature_group/delta.go @@ -194,31 +194,6 @@ func newResourceDelta( delta.Add("Spec.RoleARN", a.ko.Spec.RoleARN, b.ko.Spec.RoleARN) } } - if ackcompare.HasNilDifference(a.ko.Spec.ThroughputConfig, b.ko.Spec.ThroughputConfig) { - delta.Add("Spec.ThroughputConfig", a.ko.Spec.ThroughputConfig, b.ko.Spec.ThroughputConfig) - } else if a.ko.Spec.ThroughputConfig != nil && b.ko.Spec.ThroughputConfig != nil { - if ackcompare.HasNilDifference(a.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits, b.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits) { - delta.Add("Spec.ThroughputConfig.ProvisionedReadCapacityUnits", a.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits, b.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits) - } else if a.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits != nil && b.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits != nil { - if *a.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits != *b.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits { - delta.Add("Spec.ThroughputConfig.ProvisionedReadCapacityUnits", a.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits, b.ko.Spec.ThroughputConfig.ProvisionedReadCapacityUnits) - } - } - if ackcompare.HasNilDifference(a.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits, b.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits) { - delta.Add("Spec.ThroughputConfig.ProvisionedWriteCapacityUnits", a.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits, b.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits) - } else if a.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits != nil && b.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits != nil { - if *a.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits != *b.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits { - delta.Add("Spec.ThroughputConfig.ProvisionedWriteCapacityUnits", a.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits, b.ko.Spec.ThroughputConfig.ProvisionedWriteCapacityUnits) - } - } - if ackcompare.HasNilDifference(a.ko.Spec.ThroughputConfig.ThroughputMode, b.ko.Spec.ThroughputConfig.ThroughputMode) { - delta.Add("Spec.ThroughputConfig.ThroughputMode", a.ko.Spec.ThroughputConfig.ThroughputMode, b.ko.Spec.ThroughputConfig.ThroughputMode) - } else if a.ko.Spec.ThroughputConfig.ThroughputMode != nil && b.ko.Spec.ThroughputConfig.ThroughputMode != nil { - if *a.ko.Spec.ThroughputConfig.ThroughputMode != *b.ko.Spec.ThroughputConfig.ThroughputMode { - delta.Add("Spec.ThroughputConfig.ThroughputMode", a.ko.Spec.ThroughputConfig.ThroughputMode, b.ko.Spec.ThroughputConfig.ThroughputMode) - } - } - } return delta } diff --git a/pkg/resource/feature_group/sdk.go b/pkg/resource/feature_group/sdk.go index 397dbd90..d642eca6 100644 --- a/pkg/resource/feature_group/sdk.go +++ b/pkg/resource/feature_group/sdk.go @@ -234,7 +234,7 @@ func (rm *resourceManager) sdkFind( ko.Spec.RoleARN = nil } if resp.ThroughputConfig != nil { - f17 := &svcapitypes.ThroughputConfig{} + f17 := &svcapitypes.ThroughputConfigDescription{} if resp.ThroughputConfig.ProvisionedReadCapacityUnits != nil { provisionedReadCapacityUnitsCopy := int64(*resp.ThroughputConfig.ProvisionedReadCapacityUnits) f17.ProvisionedReadCapacityUnits = &provisionedReadCapacityUnitsCopy