Skip to content

Commit a6d0d76

Browse files
committed
Nit changes before release
1 parent 3b67f8f commit a6d0d76

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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)