diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea8f06e5..9da1461e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,7 +64,7 @@ any 'help wanted' issues is a great place to start. [See the documentation][dev-docs] for detailed development information. -[dev-docs]: https://aws-controllers-k8s.github.io/community/dev-docs/overview/ +[dev-docs]: https://aws-controllers-k8s.github.io/community/docs/contributor-docs/overview/ ## Code of Conduct diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 82ece7de..e1e35218 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2021-09-13T20:22:07Z" - build_hash: c6e8ce29423336f827d2ca5c737595561c84539c - go_version: go1.16.4 - version: v0.13.2 -api_directory_checksum: 24add693149f092555aa338064f0129184c281d1 + build_date: "2021-10-08T20:19:54Z" + build_hash: 1eaee0ea592ad5752cb9d403e2c13e9a7bdb8d33 + go_version: go1.17.1 + version: v0.15.1 +api_directory_checksum: e768091ac8c8e31bb92321a47724cb9ffb5b0ee3 api_version: v1alpha1 aws_sdk_go_version: v1.38.11 generator_config_info: - file_checksum: b665c78d02f4ede0a1add8215f949f95c80621da + file_checksum: 8c59f7c55e4d6a9b98b623a0736a37c7a22e4882 original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index 6db9a333..7a350440 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -13,18 +13,9 @@ operations: RetainAllVariantProperties: true DescribeModelPackage: custom_check_required_fields_missing_method: customCheckRequiredFieldsMissingMethod - primary_identifier_field_name: ARN StopHyperParameterTuningJob: operation_type: Delete resource_name: HyperParameterTuningJob - DescribeModelQualityJobDefinition: - primary_identifier_field_name: JobDefinitionName - DescribeModelBiasJobDefinition: - primary_identifier_field_name: JobDefinitionName - DescribeDataQualityJobDefinition: - primary_identifier_field_name: JobDefinitionName - DescribeModelExplainabilityJobDefinition: - primary_identifier_field_name: JobDefinitionName resources: Model: hooks: @@ -363,6 +354,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -382,6 +374,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -401,6 +394,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -420,6 +414,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -484,6 +479,7 @@ resources: is_ignored: true ModelPackage: update_conditions_custom_method_name: CustomUpdateConditions + is_arn_primary_key: true exceptions: errors: 404: diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index 9f506475..ad59dfcb 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml index d5f841c7..a67ddadd 100644 --- a/config/controller/deployment.yaml +++ b/config/controller/deployment.yaml @@ -26,8 +26,6 @@ spec: - command: - ./bin/controller args: - - --aws-account-id - - "$(AWS_ACCOUNT_ID)" - --aws-region - "$(AWS_REGION)" - --enable-development-logging @@ -41,7 +39,8 @@ spec: image: controller:latest name: controller ports: - - containerPort: 8080 + - name: http + containerPort: 8080 resources: limits: cpu: 100m diff --git a/config/controller/service.yaml b/config/controller/service.yaml index 76d9b192..a73d8e65 100644 --- a/config/controller/service.yaml +++ b/config/controller/service.yaml @@ -9,6 +9,6 @@ spec: ports: - name: metricsport port: 8080 - targetPort: 8080 + targetPort: http protocol: TCP - type: NodePort \ No newline at end of file + type: NodePort diff --git a/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml index adefc644..b3c91b01 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: dataqualityjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml index aea75a96..ad9ca925 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: endpointconfigs.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml b/config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml index 8453bc5c..2ba2f2db 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: endpoints.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml b/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml index d137d9a8..8b39b092 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: featuregroups.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml index 07b525c2..9d879f27 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: hyperparametertuningjobs.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml index 1abc8ded..821fa9c2 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelbiasjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml index c0c18f7f..fb247452 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelexplainabilityjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml index d7a1977c..9dafad50 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelpackagegroups.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml index 02525654..f417f61a 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelpackages.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml b/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml index cd06c477..a06e9711 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelqualityjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_models.yaml b/config/crd/bases/sagemaker.services.k8s.aws_models.yaml index dfdc4782..6e6d2c13 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_models.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_models.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: models.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml b/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml index ddaac835..e93cdf4d 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: monitoringschedules.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml index ee04f8e5..874ba124 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: notebookinstancelifecycleconfigs.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml index c474befa..5e949cb4 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: notebookinstances.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml index a27fe001..58ef8438 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: processingjobs.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml index 25130429..0c218f42 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: trainingjobs.sagemaker.services.k8s.aws spec: diff --git a/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml index a0cabca6..acde2c97 100644 --- a/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml +++ b/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: transformjobs.sagemaker.services.k8s.aws spec: diff --git a/generator.yaml b/generator.yaml index 6db9a333..7a350440 100644 --- a/generator.yaml +++ b/generator.yaml @@ -13,18 +13,9 @@ operations: RetainAllVariantProperties: true DescribeModelPackage: custom_check_required_fields_missing_method: customCheckRequiredFieldsMissingMethod - primary_identifier_field_name: ARN StopHyperParameterTuningJob: operation_type: Delete resource_name: HyperParameterTuningJob - DescribeModelQualityJobDefinition: - primary_identifier_field_name: JobDefinitionName - DescribeModelBiasJobDefinition: - primary_identifier_field_name: JobDefinitionName - DescribeDataQualityJobDefinition: - primary_identifier_field_name: JobDefinitionName - DescribeModelExplainabilityJobDefinition: - primary_identifier_field_name: JobDefinitionName resources: Model: hooks: @@ -363,6 +354,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -382,6 +374,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -401,6 +394,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -420,6 +414,7 @@ resources: is_arn: true JobDefinitionName: is_name: true + is_primary_key: true Tags: compare: is_ignored: true @@ -484,6 +479,7 @@ resources: is_ignored: true ModelPackage: update_conditions_custom_method_name: CustomUpdateConditions + is_arn_primary_key: true exceptions: errors: 404: diff --git a/go.mod b/go.mod index 17f4f57d..b69287d3 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/sagemaker-controller go 1.14 require ( - github.com/aws-controllers-k8s/runtime v0.13.2 + github.com/aws-controllers-k8s/runtime v0.15.1 github.com/aws/aws-sdk-go v1.38.11 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v0.1.0 diff --git a/go.sum b/go.sum index b68809ce..8388cd50 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws-controllers-k8s/runtime v0.13.2 h1:+gVwW4dTndPb4lB0WNLdHeiP7AGBOV+wBHGjpQUOh+w= -github.com/aws-controllers-k8s/runtime v0.13.2/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c= +github.com/aws-controllers-k8s/runtime v0.15.1 h1:3P+6MKWe8ITJynmoxmDnMPlkoI9nuVgn8XD9Pt/XHE8= +github.com/aws-controllers-k8s/runtime v0.15.1/go.mod h1:W0Txdhb1Npx5kg72w2WFwIpGFvSsMxXlJzzNHAwCLeY= github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.11 h1:jmxKh557ZRc+Z8fALnGrL01Ctjks2aSUFLb7n/BZoEs= github.com/aws/aws-sdk-go v1.38.11/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= @@ -177,6 +177,8 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWow= +github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml index adefc644..b3c91b01 100644 --- a/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: dataqualityjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml b/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml index aea75a96..ad9ca925 100644 --- a/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: endpointconfigs.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_endpoints.yaml b/helm/crds/sagemaker.services.k8s.aws_endpoints.yaml index 8453bc5c..2ba2f2db 100644 --- a/helm/crds/sagemaker.services.k8s.aws_endpoints.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_endpoints.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: endpoints.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml b/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml index d137d9a8..8b39b092 100644 --- a/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: featuregroups.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml index 07b525c2..9d879f27 100644 --- a/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: hyperparametertuningjobs.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml index 1abc8ded..821fa9c2 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelbiasjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml index c0c18f7f..fb247452 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelexplainabilityjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.yaml b/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.yaml index d7a1977c..9dafad50 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelpackagegroups.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelpackagegroups.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_modelpackages.yaml b/helm/crds/sagemaker.services.k8s.aws_modelpackages.yaml index 02525654..f417f61a 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelpackages.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelpackages.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelpackages.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml b/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml index cd06c477..a06e9711 100644 --- a/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: modelqualityjobdefinitions.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_models.yaml b/helm/crds/sagemaker.services.k8s.aws_models.yaml index dfdc4782..6e6d2c13 100644 --- a/helm/crds/sagemaker.services.k8s.aws_models.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_models.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: models.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.yaml b/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.yaml index ddaac835..e93cdf4d 100644 --- a/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_monitoringschedules.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: monitoringschedules.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml b/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml index ee04f8e5..874ba124 100644 --- a/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: notebookinstancelifecycleconfigs.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_notebookinstances.yaml b/helm/crds/sagemaker.services.k8s.aws_notebookinstances.yaml index c474befa..5e949cb4 100644 --- a/helm/crds/sagemaker.services.k8s.aws_notebookinstances.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_notebookinstances.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: notebookinstances.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_processingjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_processingjobs.yaml index a27fe001..58ef8438 100644 --- a/helm/crds/sagemaker.services.k8s.aws_processingjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_processingjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: processingjobs.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_trainingjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_trainingjobs.yaml index 25130429..0c218f42 100644 --- a/helm/crds/sagemaker.services.k8s.aws_trainingjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_trainingjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: trainingjobs.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/sagemaker.services.k8s.aws_transformjobs.yaml b/helm/crds/sagemaker.services.k8s.aws_transformjobs.yaml index a0cabca6..acde2c97 100644 --- a/helm/crds/sagemaker.services.k8s.aws_transformjobs.yaml +++ b/helm/crds/sagemaker.services.k8s.aws_transformjobs.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: transformjobs.sagemaker.services.k8s.aws spec: diff --git a/helm/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml index c1b24843..baee8555 100644 --- a/helm/crds/services.k8s.aws_adoptedresources.yaml +++ b/helm/crds/services.k8s.aws_adoptedresources.yaml @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.1 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: adoptedresources.services.k8s.aws spec: diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 85f5e323..b0ade59f 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -37,8 +37,6 @@ spec: - command: - ./bin/controller args: - - --aws-account-id - - "$(AWS_ACCOUNT_ID)" - --aws-region - "$(AWS_REGION)" - --aws-endpoint-url @@ -54,7 +52,8 @@ spec: image: {{ .Values.image.repository }}:{{ .Values.image.tag }} name: controller ports: - - containerPort: {{ .Values.deployment.containerPort }} + - name: http + containerPort: {{ .Values.deployment.containerPort }} resources: {{- toYaml .Values.resources | nindent 10 }} env: @@ -62,8 +61,6 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: AWS_ACCOUNT_ID - value: {{ .Values.aws.account_id | quote }} - name: AWS_REGION value: {{ .Values.aws.region }} - name: AWS_ENDPOINT_URL diff --git a/helm/templates/metrics-service.yaml b/helm/templates/metrics-service.yaml index 24cf69f3..a010fa64 100644 --- a/helm/templates/metrics-service.yaml +++ b/helm/templates/metrics-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "app.fullname" . }}-metrics + name: {{ .Chart.Name | trimSuffix "-chart" | trunc 44 }}-controller-metrics namespace: {{ .Release.Namespace }} labels: app.kubernetes.io/name: {{ include "app.name" . }} @@ -25,6 +25,6 @@ spec: ports: - name: metricsport port: 8080 - targetPort: 8080 + targetPort: http protocol: TCP -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/templates/service-account.yaml b/helm/templates/service-account.yaml index 4fc81d3b..73306395 100644 --- a/helm/templates/service-account.yaml +++ b/helm/templates/service-account.yaml @@ -10,8 +10,9 @@ metadata: k8s-app: {{ include "app.name" . }} helm.sh/chart: {{ include "chart.name-version" . }} name: {{ include "service-account.name" . }} + namespace: {{ .Release.Namespace }} annotations: {{- range $key, $value := .Values.serviceAccount.annotations }} {{ $key }}: {{ $value | quote }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/values.yaml b/helm/values.yaml index 3bd73863..7af3967d 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -38,7 +38,6 @@ resources: aws: # If specified, use the AWS region for AWS API calls region: "" - account_id: "" endpoint_url: "" # log level for the controller diff --git a/pkg/resource/data_quality_job_definition/descriptor.go b/pkg/resource/data_quality_job_definition/descriptor.go index ff716716..13d894e1 100644 --- a/pkg/resource/data_quality_job_definition/descriptor.go +++ b/pkg/resource/data_quality_job_definition/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("dataqualityjobdefinitions") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "DataQualityJobDefinition", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/endpoint/custom_update_conditions.go b/pkg/resource/endpoint/custom_update_conditions.go index caf07613..77a3209c 100644 --- a/pkg/resource/endpoint/custom_update_conditions.go +++ b/pkg/resource/endpoint/custom_update_conditions.go @@ -38,7 +38,7 @@ func (rm *resourceManager) CustomUpdateConditions( latestStatus := r.ko.Status.EndpointStatus terminalStatus := svcsdk.EndpointStatusFailed conditionManager := &resource{ko} - resourceName := resourceGK.Kind + resourceName := GroupKind.Kind // If the latestStatus == terminalStatus we will set // the terminal condition and terminal message. updated := svccommon.SetTerminalState(conditionManager, latestStatus, &resourceName, terminalStatus) diff --git a/pkg/resource/endpoint/descriptor.go b/pkg/resource/endpoint/descriptor.go index 844ea481..03906b12 100644 --- a/pkg/resource/endpoint/descriptor.go +++ b/pkg/resource/endpoint/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("endpoints") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "Endpoint", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/endpoint/hooks.go b/pkg/resource/endpoint/hooks.go index eb33360c..71460b4f 100644 --- a/pkg/resource/endpoint/hooks.go +++ b/pkg/resource/endpoint/hooks.go @@ -37,9 +37,9 @@ var ( svcsdk.EndpointStatusDeleting, } - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind - lastEndpointConfigForUpdateAnnotation = fmt.Sprintf("%s/last-endpoint-config-for-update", resourceGK.Group) + lastEndpointConfigForUpdateAnnotation = fmt.Sprintf("%s/last-endpoint-config-for-update", GroupKind.Group) FailureReasonInternalServiceErrorPrefix = "Request to service failed" diff --git a/pkg/resource/endpoint_config/descriptor.go b/pkg/resource/endpoint_config/descriptor.go index e64208cf..6b22f484 100644 --- a/pkg/resource/endpoint_config/descriptor.go +++ b/pkg/resource/endpoint_config/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("endpointconfigs") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "EndpointConfig", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/feature_group/descriptor.go b/pkg/resource/feature_group/descriptor.go index 842f6004..b54e53a2 100644 --- a/pkg/resource/feature_group/descriptor.go +++ b/pkg/resource/feature_group/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("featuregroups") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "FeatureGroup", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/feature_group/hooks.go b/pkg/resource/feature_group/hooks.go index 768b2f62..94834b81 100644 --- a/pkg/resource/feature_group/hooks.go +++ b/pkg/resource/feature_group/hooks.go @@ -25,7 +25,7 @@ var ( modifyingStatuses = []string{svcsdk.FeatureGroupStatusCreating, svcsdk.FeatureGroupStatusDeleting} - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is deleting."), diff --git a/pkg/resource/hyper_parameter_tuning_job/descriptor.go b/pkg/resource/hyper_parameter_tuning_job/descriptor.go index caedb5de..e96fcdae 100644 --- a/pkg/resource/hyper_parameter_tuning_job/descriptor.go +++ b/pkg/resource/hyper_parameter_tuning_job/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("hyperparametertuningjobs") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "HyperParameterTuningJob", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/hyper_parameter_tuning_job/hooks.go b/pkg/resource/hyper_parameter_tuning_job/hooks.go index fc6c22a6..abcc1b56 100644 --- a/pkg/resource/hyper_parameter_tuning_job/hooks.go +++ b/pkg/resource/hyper_parameter_tuning_job/hooks.go @@ -26,7 +26,7 @@ var ( svcsdk.HyperParameterTuningJobStatusInProgress, svcsdk.HyperParameterTuningJobStatusStopping, } - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is Stopping."), diff --git a/pkg/resource/model/descriptor.go b/pkg/resource/model/descriptor.go index fb58b170..c3da2120 100644 --- a/pkg/resource/model/descriptor.go +++ b/pkg/resource/model/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("models") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "Model", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model_bias_job_definition/descriptor.go b/pkg/resource/model_bias_job_definition/descriptor.go index 4735014f..6577d5da 100644 --- a/pkg/resource/model_bias_job_definition/descriptor.go +++ b/pkg/resource/model_bias_job_definition/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("modelbiasjobdefinitions") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "ModelBiasJobDefinition", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model_explainability_job_definition/descriptor.go b/pkg/resource/model_explainability_job_definition/descriptor.go index 428b3196..188da3b3 100644 --- a/pkg/resource/model_explainability_job_definition/descriptor.go +++ b/pkg/resource/model_explainability_job_definition/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("modelexplainabilityjobdefinitions") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "ModelExplainabilityJobDefinition", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model_package/descriptor.go b/pkg/resource/model_package/descriptor.go index df4cb1f5..2d97508f 100644 --- a/pkg/resource/model_package/descriptor.go +++ b/pkg/resource/model_package/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("modelpackages") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "ModelPackage", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model_package/hooks.go b/pkg/resource/model_package/hooks.go index 45235a28..34042ae5 100644 --- a/pkg/resource/model_package/hooks.go +++ b/pkg/resource/model_package/hooks.go @@ -27,7 +27,7 @@ var ( svcsdk.ModelPackageStatusPending, svcsdk.ModelPackageStatusDeleting} - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is deleting."), diff --git a/pkg/resource/model_package_group/descriptor.go b/pkg/resource/model_package_group/descriptor.go index a16f5258..1b2d27fc 100644 --- a/pkg/resource/model_package_group/descriptor.go +++ b/pkg/resource/model_package_group/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("modelpackagegroups") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "ModelPackageGroup", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model_package_group/hooks.go b/pkg/resource/model_package_group/hooks.go index 66d841f3..455457e5 100644 --- a/pkg/resource/model_package_group/hooks.go +++ b/pkg/resource/model_package_group/hooks.go @@ -27,7 +27,7 @@ var ( svcsdk.ModelPackageGroupStatusPending, svcsdk.ModelPackageGroupStatusDeleting} - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is deleting."), diff --git a/pkg/resource/model_quality_job_definition/descriptor.go b/pkg/resource/model_quality_job_definition/descriptor.go index d340ec2f..3e34638c 100644 --- a/pkg/resource/model_quality_job_definition/descriptor.go +++ b/pkg/resource/model_quality_job_definition/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("modelqualityjobdefinitions") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "ModelQualityJobDefinition", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/monitoring_schedule/custom_update_conditions.go b/pkg/resource/monitoring_schedule/custom_update_conditions.go index 7ffc1cf6..02935660 100644 --- a/pkg/resource/monitoring_schedule/custom_update_conditions.go +++ b/pkg/resource/monitoring_schedule/custom_update_conditions.go @@ -33,7 +33,7 @@ func (rm *resourceManager) CustomUpdateConditions( latestStatus := r.ko.Status.MonitoringScheduleStatus terminalStatus := svcsdk.ScheduleStatusFailed conditionManager := &resource{ko} - resourceName := resourceGK.Kind + resourceName := GroupKind.Kind // If the latestStatus == terminalStatus we will set // the terminal condition and terminal message. return svccommon.SetTerminalState(conditionManager, latestStatus, &resourceName, terminalStatus) diff --git a/pkg/resource/monitoring_schedule/descriptor.go b/pkg/resource/monitoring_schedule/descriptor.go index f82f94d8..008b1e85 100644 --- a/pkg/resource/monitoring_schedule/descriptor.go +++ b/pkg/resource/monitoring_schedule/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("monitoringschedules") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "MonitoringSchedule", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/monitoring_schedule/hooks.go b/pkg/resource/monitoring_schedule/hooks.go index a1941088..71f03796 100644 --- a/pkg/resource/monitoring_schedule/hooks.go +++ b/pkg/resource/monitoring_schedule/hooks.go @@ -27,7 +27,7 @@ var ( "Pending", } - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is Deleting."), diff --git a/pkg/resource/notebook_instance/descriptor.go b/pkg/resource/notebook_instance/descriptor.go index dc76c475..822c5a28 100644 --- a/pkg/resource/notebook_instance/descriptor.go +++ b/pkg/resource/notebook_instance/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("notebookinstances") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "NotebookInstance", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/notebook_instance/hooks.go b/pkg/resource/notebook_instance/hooks.go index d2e35aa2..5109c19e 100644 --- a/pkg/resource/notebook_instance/hooks.go +++ b/pkg/resource/notebook_instance/hooks.go @@ -20,8 +20,7 @@ var ( svcsdk.NotebookInstanceStatusStopping, } - resourceName = resourceGK.Kind - + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is deleting."), ackrequeue.DefaultRequeueAfterDuration, diff --git a/pkg/resource/notebook_instance_lifecycle_config/descriptor.go b/pkg/resource/notebook_instance_lifecycle_config/descriptor.go index 330e3be9..ac845dcc 100644 --- a/pkg/resource/notebook_instance_lifecycle_config/descriptor.go +++ b/pkg/resource/notebook_instance_lifecycle_config/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("notebookinstancelifecycleconfigs") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "NotebookInstanceLifecycleConfig", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/notebook_instance_lifecycle_config/hooks.go b/pkg/resource/notebook_instance_lifecycle_config/hooks.go index 81c3af34..8e29cfe5 100644 --- a/pkg/resource/notebook_instance_lifecycle_config/hooks.go +++ b/pkg/resource/notebook_instance_lifecycle_config/hooks.go @@ -7,7 +7,7 @@ import ( ) var ( - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileUpdating = ackrequeue.NeededAfter( errors.New(resourceName+" is updating."), diff --git a/pkg/resource/processing_job/descriptor.go b/pkg/resource/processing_job/descriptor.go index c5ed69db..a628b32a 100644 --- a/pkg/resource/processing_job/descriptor.go +++ b/pkg/resource/processing_job/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("processingjobs") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "ProcessingJob", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/processing_job/hooks.go b/pkg/resource/processing_job/hooks.go index 939456ea..57ffe292 100644 --- a/pkg/resource/processing_job/hooks.go +++ b/pkg/resource/processing_job/hooks.go @@ -26,7 +26,7 @@ var ( svcsdk.ProcessingJobStatusInProgress, svcsdk.ProcessingJobStatusStopping, } - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is Stopping."), diff --git a/pkg/resource/training_job/descriptor.go b/pkg/resource/training_job/descriptor.go index ec69cbca..612603e6 100644 --- a/pkg/resource/training_job/descriptor.go +++ b/pkg/resource/training_job/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("trainingjobs") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "TrainingJob", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/training_job/hooks.go b/pkg/resource/training_job/hooks.go index de67a226..6efd865f 100644 --- a/pkg/resource/training_job/hooks.go +++ b/pkg/resource/training_job/hooks.go @@ -31,7 +31,7 @@ var ( svcsdk.RuleEvaluationStatusInProgress, svcsdk.RuleEvaluationStatusStopping, } - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is Stopping."), diff --git a/pkg/resource/transform_job/descriptor.go b/pkg/resource/transform_job/descriptor.go index f5a3f96d..2f61d001 100644 --- a/pkg/resource/transform_job/descriptor.go +++ b/pkg/resource/transform_job/descriptor.go @@ -31,7 +31,8 @@ const ( ) var ( - resourceGK = metav1.GroupKind{ + GroupVersionResource = svcapitypes.GroupVersion.WithResource("transformjobs") + GroupKind = metav1.GroupKind{ Group: "sagemaker.services.k8s.aws", Kind: "TransformJob", } @@ -45,7 +46,7 @@ type resourceDescriptor struct { // GroupKind returns a Kubernetes metav1.GroupKind struct that describes the // API Group and Kind of CRs described by the descriptor func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { - return &resourceGK + return &GroupKind } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/transform_job/hooks.go b/pkg/resource/transform_job/hooks.go index a6c403ac..d657fe08 100644 --- a/pkg/resource/transform_job/hooks.go +++ b/pkg/resource/transform_job/hooks.go @@ -30,7 +30,7 @@ var ( svcsdk.TransformJobStatusStopping, } - resourceName = resourceGK.Kind + resourceName = GroupKind.Kind requeueWaitWhileDeleting = ackrequeue.NeededAfter( errors.New(resourceName+" is Stopping."),