Skip to content

Commit 732e683

Browse files
authored
Release artifacts for release v1.4.0 (#128)
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 278651e commit 732e683

File tree

7 files changed

+14
-9
lines changed

7 files changed

+14
-9
lines changed

config/controller/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/dynamodb-controller
9-
newTag: 1.3.0
9+
newTag: 1.4.0

helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: dynamodb-chart
33
description: A Helm chart for the ACK service controller for Amazon DynamoDB (DynamoDB)
4-
version: 1.3.0
5-
appVersion: 1.3.0
4+
version: 1.4.0
5+
appVersion: 1.4.0
66
home: https://github.com/aws-controllers-k8s/dynamodb-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

helm/templates/NOTES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/dynamodb-controller:1.3.0".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/dynamodb-controller:1.4.0".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

helm/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/dynamodb-controller
7-
tag: 1.3.0
7+
tag: 1.4.0
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

pkg/resource/table/hooks.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,10 @@ func customPreCompare(
611611
a.ko.Spec.DeletionProtectionEnabled = aws.Bool(false)
612612
}
613613

614-
if a.ko.Spec.ContributorInsights == nil && b.ko.Spec.ContributorInsights != nil &&
615-
*b.ko.Spec.ContributorInsights == string(svcsdktypes.ContributorInsightsActionDisable) {
614+
// Making this field a no-op if user does not set it.
615+
// This will ensure controller does not act on this field
616+
// if user is unaware of it.
617+
if a.ko.Spec.ContributorInsights == nil {
616618
a.ko.Spec.ContributorInsights = b.ko.Spec.ContributorInsights
617619
}
618620
}

test/e2e/tests/test_table.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from e2e.replacement_values import REPLACEMENT_VALUES
3030

3131
RESOURCE_PLURAL = "tables"
32-
32+
CREATE_WAIT_AFTER_SECONDS = 30
3333
DELETE_WAIT_AFTER_SECONDS = 15
3434
MODIFY_WAIT_AFTER_SECONDS = 90
3535

@@ -71,6 +71,8 @@ def create_table(name: str, resource_template):
7171
name, namespace="default",
7272
)
7373

74+
time.sleep(CREATE_WAIT_AFTER_SECONDS)
75+
7476
# Create table
7577
k8s.create_custom_resource(table_reference, resource_data)
7678
table_resource = k8s.wait_resource_consumed_by_controller(table_reference)

test/e2e/tests/test_table_replicas.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from acktest.k8s import condition
3030

3131
RESOURCE_PLURAL = "tables"
32-
32+
CREATE_WAIT_AFTER_SECONDS = 30
3333
DELETE_WAIT_AFTER_SECONDS = 30
3434
MODIFY_WAIT_AFTER_SECONDS = 600
3535
REPLICA_WAIT_AFTER_SECONDS = 600
@@ -113,6 +113,7 @@ def create_table_with_invalid_replicas(name: str):
113113
)
114114
logging.debug(resource_data)
115115

116+
time.sleep(CREATE_WAIT_AFTER_SECONDS)
116117
# Create the k8s resource
117118
ref = k8s.CustomResourceReference(
118119
CRD_GROUP, CRD_VERSION, RESOURCE_PLURAL,

0 commit comments

Comments
 (0)