diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 6a16e593..4c50bcf9 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2023-03-16T21:08:36Z" - build_hash: 910a8e0744a99c5c87d8c1615926985215a60d8c + build_date: "2023-03-22T22:11:35Z" + build_hash: fa24753ea8b657d8815ae3eac7accd0958f5f9fb go_version: go1.19 - version: v0.24.3 + version: v0.25.0 api_directory_checksum: 62a1b01c505efd55545d306c2353b9673ce344fb api_version: v1alpha1 aws_sdk_go_version: v1.44.218 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 422b91a2..87142a6b 100644 --- a/config/controller/kustomization.yaml +++ b/config/controller/kustomization.yaml @@ -6,4 +6,4 @@ kind: Kustomization images: - name: controller newName: public.ecr.aws/aws-controllers-k8s/sagemaker-controller - newTag: v1.2.0 + newTag: v1.2.1 diff --git a/go.mod b/go.mod index c91f126d..07d9648e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/sagemaker-controller go 1.19 require ( - github.com/aws-controllers-k8s/runtime v0.24.1 + github.com/aws-controllers-k8s/runtime v0.25.0 github.com/aws/aws-sdk-go v1.44.218 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index f060d29e..a6b67166 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/aws-controllers-k8s/runtime v0.24.1 h1:vmOWKlo4oPtPxeofRnd/dA49WR5VZSqSxHiSiNTiknY= -github.com/aws-controllers-k8s/runtime v0.24.1/go.mod h1:jizDzKikL09cueIuA9ZxoZ+4pfn5U7oKW5s/ZAqOA6E= +github.com/aws-controllers-k8s/runtime v0.25.0 h1:6SYa8qmbw+Yil5/LodF7LmIGxBhpjz4QEIvNjpeRuoc= +github.com/aws-controllers-k8s/runtime v0.25.0/go.mod h1:jizDzKikL09cueIuA9ZxoZ+4pfn5U7oKW5s/ZAqOA6E= github.com/aws/aws-sdk-go v1.44.218 h1:p707+xOCazWhkSpZOeyhtTcg7Z+asxxvueGgYPSitn4= github.com/aws/aws-sdk-go v1.44.218/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index deea63c9..05d35a5f 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: sagemaker-chart description: A Helm chart for the ACK service controller for Amazon SageMaker (SageMaker) -version: v1.2.0 -appVersion: v1.2.0 +version: v1.2.1 +appVersion: v1.2.1 home: https://github.com/aws-controllers-k8s/sagemaker-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index 1a49d9a3..9529ec87 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/sagemaker-controller:v1.2.0". +This chart deploys "public.ecr.aws/aws-controllers-k8s/sagemaker-controller:v1.2.1". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/values.yaml b/helm/values.yaml index a909408f..3b04d46b 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/sagemaker-controller - tag: v1.2.0 + tag: v1.2.1 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/app/descriptor.go b/pkg/resource/app/descriptor.go index 41641178..7990ee9f 100644 --- a/pkg/resource/app/descriptor.go +++ b/pkg/resource/app/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/data_quality_job_definition/descriptor.go b/pkg/resource/data_quality_job_definition/descriptor.go index 400b0a7a..6d79fbb3 100644 --- a/pkg/resource/data_quality_job_definition/descriptor.go +++ b/pkg/resource/data_quality_job_definition/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/domain/descriptor.go b/pkg/resource/domain/descriptor.go index f36bb260..20da9fc1 100644 --- a/pkg/resource/domain/descriptor.go +++ b/pkg/resource/domain/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/endpoint/descriptor.go b/pkg/resource/endpoint/descriptor.go index 54d9b31d..ed8b8645 100644 --- a/pkg/resource/endpoint/descriptor.go +++ b/pkg/resource/endpoint/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/endpoint_config/descriptor.go b/pkg/resource/endpoint_config/descriptor.go index 5ba4be9b..a03442b0 100644 --- a/pkg/resource/endpoint_config/descriptor.go +++ b/pkg/resource/endpoint_config/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // 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 89fb0ebb..f9af681a 100644 --- a/pkg/resource/feature_group/descriptor.go +++ b/pkg/resource/feature_group/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/hyper_parameter_tuning_job/descriptor.go b/pkg/resource/hyper_parameter_tuning_job/descriptor.go index fdb64a6f..652631f5 100644 --- a/pkg/resource/hyper_parameter_tuning_job/descriptor.go +++ b/pkg/resource/hyper_parameter_tuning_job/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model/descriptor.go b/pkg/resource/model/descriptor.go index a73b392e..8f93e6c8 100644 --- a/pkg/resource/model/descriptor.go +++ b/pkg/resource/model/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // 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 a1515396..048bfa13 100644 --- a/pkg/resource/model_bias_job_definition/descriptor.go +++ b/pkg/resource/model_bias_job_definition/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // 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 0dcf7284..16b6c636 100644 --- a/pkg/resource/model_explainability_job_definition/descriptor.go +++ b/pkg/resource/model_explainability_job_definition/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // 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 bc747b79..5a606a20 100644 --- a/pkg/resource/model_package/descriptor.go +++ b/pkg/resource/model_package/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model_package_group/descriptor.go b/pkg/resource/model_package_group/descriptor.go index 8c310e1e..e7a01f30 100644 --- a/pkg/resource/model_package_group/descriptor.go +++ b/pkg/resource/model_package_group/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/model_quality_job_definition/descriptor.go b/pkg/resource/model_quality_job_definition/descriptor.go index 69299909..3e259397 100644 --- a/pkg/resource/model_quality_job_definition/descriptor.go +++ b/pkg/resource/model_quality_job_definition/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/monitoring_schedule/descriptor.go b/pkg/resource/monitoring_schedule/descriptor.go index aebcca7e..7108f004 100644 --- a/pkg/resource/monitoring_schedule/descriptor.go +++ b/pkg/resource/monitoring_schedule/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/notebook_instance/descriptor.go b/pkg/resource/notebook_instance/descriptor.go index a9425645..0a78451e 100644 --- a/pkg/resource/notebook_instance/descriptor.go +++ b/pkg/resource/notebook_instance/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/notebook_instance_lifecycle_config/descriptor.go b/pkg/resource/notebook_instance_lifecycle_config/descriptor.go index b56f42c7..c8dae7fa 100644 --- a/pkg/resource/notebook_instance_lifecycle_config/descriptor.go +++ b/pkg/resource/notebook_instance_lifecycle_config/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/pipeline/descriptor.go b/pkg/resource/pipeline/descriptor.go index 5690d636..ad4c575a 100644 --- a/pkg/resource/pipeline/descriptor.go +++ b/pkg/resource/pipeline/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/pipeline_execution/descriptor.go b/pkg/resource/pipeline_execution/descriptor.go index 0a6ec4e3..b7f134a0 100644 --- a/pkg/resource/pipeline_execution/descriptor.go +++ b/pkg/resource/pipeline_execution/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/processing_job/descriptor.go b/pkg/resource/processing_job/descriptor.go index d8aa4015..e36d29eb 100644 --- a/pkg/resource/processing_job/descriptor.go +++ b/pkg/resource/processing_job/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/training_job/descriptor.go b/pkg/resource/training_job/descriptor.go index 2265ca2b..8e79f2f6 100644 --- a/pkg/resource/training_job/descriptor.go +++ b/pkg/resource/training_job/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/transform_job/descriptor.go b/pkg/resource/transform_job/descriptor.go index 75552877..b790c633 100644 --- a/pkg/resource/transform_job/descriptor.go +++ b/pkg/resource/transform_job/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in diff --git a/pkg/resource/user_profile/descriptor.go b/pkg/resource/user_profile/descriptor.go index 496d9ce8..88a69f7b 100644 --- a/pkg/resource/user_profile/descriptor.go +++ b/pkg/resource/user_profile/descriptor.go @@ -20,6 +20,7 @@ import ( ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" rtclient "sigs.k8s.io/controller-runtime/pkg/client" k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -43,10 +44,10 @@ var ( 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 &GroupKind +// GroupVersionKind returns a Kubernetes schema.GroupVersionKind struct that +// describes the API Group, Version and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupVersionKind() schema.GroupVersionKind { + return svcapitypes.GroupVersion.WithKind(GroupKind.Kind) } // EmptyRuntimeObject returns an empty object prototype that may be used in