diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index e075f6c..0de68ca 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2024-10-10T04:04:43Z" - build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b - go_version: go1.23.2 - version: v0.39.1 + build_date: "2024-12-09T17:23:01Z" + build_hash: 631aeb190e332addb8379672df6367a0875dce88 + go_version: go1.23.3 + version: v0.40.0 api_directory_checksum: 9a42343e86bd2d87a33f81b6a69245d083eac571 api_version: v1alpha1 aws_sdk_go_version: v1.44.300 diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml index 3d4ae53..79cc8d4 100644 --- a/config/controller/deployment.yaml +++ b/config/controller/deployment.yaml @@ -41,6 +41,8 @@ spec: - "$(LEADER_ELECTION_NAMESPACE)" - --reconcile-default-max-concurrent-syncs - "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)" + - --feature-gates + - "$(FEATURE_GATES)" image: controller:latest name: controller ports: @@ -76,6 +78,8 @@ spec: value: "ack-system" - name: "RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS" value: "1" + - name: "FEATURE_GATES" + value: "" securityContext: allowPrivilegeEscalation: false privileged: false diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 8d3111a..060323a 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/route53resolver-controller - newTag: 1.0.0 + newTag: 1.0.1 diff --git a/go.mod b/go.mod index dded3cf..a58b80e 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.5 require ( github.com/aws-controllers-k8s/ec2-controller v1.0.4 - github.com/aws-controllers-k8s/runtime v0.39.0 + github.com/aws-controllers-k8s/runtime v0.40.0 github.com/aws/aws-sdk-go v1.49.0 github.com/go-logr/logr v1.4.2 github.com/samber/lo v1.37.0 diff --git a/go.sum b/go.sum index 1881e82..e73198d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/aws-controllers-k8s/ec2-controller v1.0.4 h1:TwjQHEl2qEhj0u0Nk4Qvc2wpNWkl8b4p707yOtIuob4= github.com/aws-controllers-k8s/ec2-controller v1.0.4/go.mod h1:y1i55VCkoj+w6OmMxqdNasbrsF3l/ZIuIpZ80akIdbs= -github.com/aws-controllers-k8s/runtime v0.39.0 h1:IgOXluSzvb4UcDr9eU7SPw5MJnL7kt5R6DuF5Qu9zVQ= -github.com/aws-controllers-k8s/runtime v0.39.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY= +github.com/aws-controllers-k8s/runtime v0.40.0 h1:FplFYgzCIbQsPafarP3dy/4bG1uGR8G1OLYOWO4a7Lc= +github.com/aws-controllers-k8s/runtime v0.40.0/go.mod h1:G07g26y1cxyZO6Ngp+LwXf03CqFyLNL7os4Py4IdyGY= github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY= github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 7524b2e..98ab9ff 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: route53resolver-chart description: A Helm chart for the ACK service controller for Amazon Route53 Resolver (Route53Resolver) -version: 1.0.0 -appVersion: 1.0.0 +version: 1.0.1 +appVersion: 1.0.1 home: https://github.com/aws-controllers-k8s/route53resolver-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 6184607..33a4f98 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/route53resolver-controller:1.0.0". +This chart deploys "public.ecr.aws/aws-controllers-k8s/route53resolver-controller:1.0.1". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/templates/caches-role-binding.yaml b/helm/templates/caches-role-binding.yaml index 9637f66..b3cd240 100644 --- a/helm/templates/caches-role-binding.yaml +++ b/helm/templates/caches-role-binding.yaml @@ -8,7 +8,7 @@ roleRef: name: ack-namespaces-cache-route53resolver-controller subjects: - kind: ServiceAccount - name: ack-route53resolver-controller + name: {{ include "ack-route53resolver-controller.service-account.name" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -22,5 +22,5 @@ roleRef: name: ack-configmaps-cache-route53resolver-controller subjects: - kind: ServiceAccount - name: ack-route53resolver-controller - namespace: {{ .Release.Namespace }} \ No newline at end of file + name: {{ include "ack-route53resolver-controller.service-account.name" . }} + namespace: {{ .Release.Namespace }} diff --git a/helm/values.yaml b/helm/values.yaml index 92be074..fc29510 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/route53resolver-controller - tag: 1.0.0 + tag: 1.0.1 pullPolicy: IfNotPresent pullSecrets: [] @@ -163,4 +163,6 @@ featureGates: # Enables the Team level granularity for CARM. See https://github.com/aws-controllers-k8s/community/issues/2031 TeamLevelCARM: false # Enable ReadOnlyResources feature/annotation. - ReadOnlyResources: false \ No newline at end of file + ReadOnlyResources: false + # Enable ResourceAdoption feature/annotation. + ResourceAdoption: false \ No newline at end of file diff --git a/pkg/resource/resolver_endpoint/descriptor.go b/pkg/resource/resolver_endpoint/descriptor.go index f8e2925..ff63221 100644 --- a/pkg/resource/resolver_endpoint/descriptor.go +++ b/pkg/resource/resolver_endpoint/descriptor.go @@ -28,7 +28,7 @@ import ( ) const ( - finalizerString = "finalizers.route53resolver.services.k8s.aws/ResolverEndpoint" + FinalizerString = "finalizers.route53resolver.services.k8s.aws/ResolverEndpoint" ) var ( @@ -88,8 +88,8 @@ func (d *resourceDescriptor) IsManaged( // https://github.com/kubernetes-sigs/controller-runtime/issues/994 is // fixed. This should be able to be: // - // return k8sctrlutil.ContainsFinalizer(obj, finalizerString) - return containsFinalizer(obj, finalizerString) + // return k8sctrlutil.ContainsFinalizer(obj, FinalizerString) + return containsFinalizer(obj, FinalizerString) } // Remove once https://github.com/kubernetes-sigs/controller-runtime/issues/994 @@ -118,7 +118,7 @@ func (d *resourceDescriptor) MarkManaged( // Should not happen. If it does, there is a bug in the code panic("nil RuntimeMetaObject in AWSResource") } - k8sctrlutil.AddFinalizer(obj, finalizerString) + k8sctrlutil.AddFinalizer(obj, FinalizerString) } // MarkUnmanaged removes the supplied resource from management by ACK. What @@ -133,7 +133,7 @@ func (d *resourceDescriptor) MarkUnmanaged( // Should not happen. If it does, there is a bug in the code panic("nil RuntimeMetaObject in AWSResource") } - k8sctrlutil.RemoveFinalizer(obj, finalizerString) + k8sctrlutil.RemoveFinalizer(obj, FinalizerString) } // MarkAdopted places descriptors on the custom resource that indicate the diff --git a/pkg/resource/resolver_endpoint/resource.go b/pkg/resource/resolver_endpoint/resource.go index a0f8f50..148ce62 100644 --- a/pkg/resource/resolver_endpoint/resource.go +++ b/pkg/resource/resolver_endpoint/resource.go @@ -93,6 +93,17 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error return nil } +// PopulateResourceFromAnnotation populates the fields passed from adoption annotation +func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { + tmp, ok := fields["id"] + if !ok { + return ackerrors.MissingNameIdentifier + } + r.ko.Status.ID = &tmp + + return nil +} + // DeepCopy will return a copy of the resource func (r *resource) DeepCopy() acktypes.AWSResource { koCopy := r.ko.DeepCopy() diff --git a/pkg/resource/resolver_rule/descriptor.go b/pkg/resource/resolver_rule/descriptor.go index a03a6d9..386b40e 100644 --- a/pkg/resource/resolver_rule/descriptor.go +++ b/pkg/resource/resolver_rule/descriptor.go @@ -28,7 +28,7 @@ import ( ) const ( - finalizerString = "finalizers.route53resolver.services.k8s.aws/ResolverRule" + FinalizerString = "finalizers.route53resolver.services.k8s.aws/ResolverRule" ) var ( @@ -88,8 +88,8 @@ func (d *resourceDescriptor) IsManaged( // https://github.com/kubernetes-sigs/controller-runtime/issues/994 is // fixed. This should be able to be: // - // return k8sctrlutil.ContainsFinalizer(obj, finalizerString) - return containsFinalizer(obj, finalizerString) + // return k8sctrlutil.ContainsFinalizer(obj, FinalizerString) + return containsFinalizer(obj, FinalizerString) } // Remove once https://github.com/kubernetes-sigs/controller-runtime/issues/994 @@ -118,7 +118,7 @@ func (d *resourceDescriptor) MarkManaged( // Should not happen. If it does, there is a bug in the code panic("nil RuntimeMetaObject in AWSResource") } - k8sctrlutil.AddFinalizer(obj, finalizerString) + k8sctrlutil.AddFinalizer(obj, FinalizerString) } // MarkUnmanaged removes the supplied resource from management by ACK. What @@ -133,7 +133,7 @@ func (d *resourceDescriptor) MarkUnmanaged( // Should not happen. If it does, there is a bug in the code panic("nil RuntimeMetaObject in AWSResource") } - k8sctrlutil.RemoveFinalizer(obj, finalizerString) + k8sctrlutil.RemoveFinalizer(obj, FinalizerString) } // MarkAdopted places descriptors on the custom resource that indicate the diff --git a/pkg/resource/resolver_rule/resource.go b/pkg/resource/resolver_rule/resource.go index 1dc9ca2..104522f 100644 --- a/pkg/resource/resolver_rule/resource.go +++ b/pkg/resource/resolver_rule/resource.go @@ -93,6 +93,17 @@ func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error return nil } +// PopulateResourceFromAnnotation populates the fields passed from adoption annotation +func (r *resource) PopulateResourceFromAnnotation(fields map[string]string) error { + tmp, ok := fields["id"] + if !ok { + return ackerrors.MissingNameIdentifier + } + r.ko.Status.ID = &tmp + + return nil +} + // DeepCopy will return a copy of the resource func (r *resource) DeepCopy() acktypes.AWSResource { koCopy := r.ko.DeepCopy()