diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index c4a4bf1..7c60fb9 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-21T18:17:06Z" - build_hash: 2c79531620df2dbdae3f3abb0f4b47c3f6a2a41a + build_date: "2023-03-22T22:19:23Z" + build_hash: fa24753ea8b657d8815ae3eac7accd0958f5f9fb go_version: go1.19 - version: v0.24.3-6-g2c79531 + version: v0.25.0 api_directory_checksum: 863961569e4c45d940e482713a85bac302b37d66 api_version: v1alpha1 aws_sdk_go_version: v1.44.93 diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 433a689..2033bd1 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/memorydb-controller - newTag: v0.0.11 + newTag: v0.0.12 diff --git a/go.mod b/go.mod index 1e002ab..f760e93 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/aws-controllers-k8s/ec2-controller v1.0.0 github.com/aws-controllers-k8s/kms-controller v1.0.0 - github.com/aws-controllers-k8s/runtime v0.24.1 + github.com/aws-controllers-k8s/runtime v0.25.0 github.com/aws-controllers-k8s/sns-controller v0.0.5 github.com/aws/aws-sdk-go v1.44.93 github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index 8623f04..40ee44c 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,8 @@ github.com/aws-controllers-k8s/ec2-controller v1.0.0 h1:Si71KZjjegndY8ITI732dMPx github.com/aws-controllers-k8s/ec2-controller v1.0.0/go.mod h1:/hrKcnF8KpsSoa5vjcVmdaR6OYWPSjkeHdVWwQljRb4= github.com/aws-controllers-k8s/kms-controller v1.0.0 h1:Tb1hyedoI+n51gLYmhbYhw9ae1nXQrYzrHhYFCvJSTw= github.com/aws-controllers-k8s/kms-controller v1.0.0/go.mod h1:eS2S9pJ6G5f4hvSoEuUyrzUjDkFnE7ctzGv3TUnnTvA= -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-controllers-k8s/sns-controller v0.0.5 h1:sFgot4v/LqeO9USfSbaWIQp7DawlF6vhMy1YU2lBXu4= github.com/aws-controllers-k8s/sns-controller v0.0.5/go.mod h1:zw3lE2Yie+E6dv3Guaa+tLtH2w5UKoH8IUNCSEJCUoA= github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 132314e..eb3db45 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: memorydb-chart description: A Helm chart for the ACK service controller for Amazon MemoryDB for Redis (MemoryDB) -version: v0.0.11 -appVersion: v0.0.11 +version: v0.0.12 +appVersion: v0.0.12 home: https://github.com/aws-controllers-k8s/memorydb-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 f9ac250..6b0f7c5 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/memorydb-controller:v0.0.11". +This chart deploys "public.ecr.aws/aws-controllers-k8s/memorydb-controller:v0.0.12". 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 ddcb671..8489bef 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/memorydb-controller - tag: v0.0.11 + tag: v0.0.12 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/acl/descriptor.go b/pkg/resource/acl/descriptor.go index 815fbea..cc2dc98 100644 --- a/pkg/resource/acl/descriptor.go +++ b/pkg/resource/acl/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/cluster/descriptor.go b/pkg/resource/cluster/descriptor.go index a310d4d..471e0ca 100644 --- a/pkg/resource/cluster/descriptor.go +++ b/pkg/resource/cluster/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/parameter_group/descriptor.go b/pkg/resource/parameter_group/descriptor.go index 1f812d7..382b5d1 100644 --- a/pkg/resource/parameter_group/descriptor.go +++ b/pkg/resource/parameter_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/snapshot/descriptor.go b/pkg/resource/snapshot/descriptor.go index 86f38df..622d175 100644 --- a/pkg/resource/snapshot/descriptor.go +++ b/pkg/resource/snapshot/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/subnet_group/descriptor.go b/pkg/resource/subnet_group/descriptor.go index 5a0ef92..0a71a41 100644 --- a/pkg/resource/subnet_group/descriptor.go +++ b/pkg/resource/subnet_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/user/descriptor.go b/pkg/resource/user/descriptor.go index c75633c..c2237e2 100644 --- a/pkg/resource/user/descriptor.go +++ b/pkg/resource/user/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