diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 65a3789..327e16e 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/dynamodb-controller - newTag: 1.4.1 + newTag: 1.4.2 diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 768584a..6b89873 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: dynamodb-chart description: A Helm chart for the ACK service controller for Amazon DynamoDB (DynamoDB) -version: 1.4.1 -appVersion: 1.4.1 +version: 1.4.2 +appVersion: 1.4.2 home: https://github.com/aws-controllers-k8s/dynamodb-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 8487723..608d227 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/dynamodb-controller:1.4.1". +This chart deploys "public.ecr.aws/aws-controllers-k8s/dynamodb-controller:1.4.2". 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 a93e110..9d214d5 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/dynamodb-controller - tag: 1.4.1 + tag: 1.4.2 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/pkg/resource/table/hooks.go b/pkg/resource/table/hooks.go index df87e72..448bbd4 100644 --- a/pkg/resource/table/hooks.go +++ b/pkg/resource/table/hooks.go @@ -614,15 +614,14 @@ func customPreCompare( // Making this field a no-op if user does not set it. // This will ensure controller does not act on this field // if user is unaware of it. - if a.ko.Spec.ContributorInsights == nil { - return - } - // latestInsight will always be either ENABLED or DISABLED, since we requeue at readOne if its not - // either - desiredInsight, _ := ensureContibutorInsight(a) - latestInsight, _ := ensureContibutorInsight(b) - if desiredInsight != latestInsight { - delta.Add("Spec.ContributorInsights", a.ko.Spec.ContributorInsights, b.ko.Spec.ContributorInsights) + if a.ko.Spec.ContributorInsights != nil { + // latestInsight will always be either ENABLED or DISABLED, since we requeue at readOne if its not + // either + desiredInsight, _ := ensureContibutorInsight(a) + latestInsight, _ := ensureContibutorInsight(b) + if desiredInsight != latestInsight { + delta.Add("Spec.ContributorInsights", a.ko.Spec.ContributorInsights, b.ko.Spec.ContributorInsights) + } } }