Skip to content

Commit d079acb

Browse files
committed
can only check for inherited annotations
1 parent 1c46d0f commit d079acb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

e2e/tests/test_e2e.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,6 +1814,7 @@ def test_password_rotation(self):
18141814
enable_password_rotation = {
18151815
"data": {
18161816
"enable_password_rotation": "true",
1817+
"inherited_annotations": "environment",
18171818
"password_rotation_interval": "30",
18181819
"password_rotation_user_retention": "30", # should be set to 60
18191820
},
@@ -1864,7 +1865,7 @@ def test_password_rotation(self):
18641865
pg_annotation_patch = {
18651866
"metadata": {
18661867
"annotations": {
1867-
"deployment-time": "2020-04-01 12:00:00",
1868+
"environment": "test",
18681869
}
18691870
}
18701871
}
@@ -1881,7 +1882,7 @@ def test_password_rotation(self):
18811882
"Unexpected username in secret of test.db_user: expected {}, got {}".format("test.db_user", secret_username))
18821883

18831884
# check if annotation for secret has been updated
1884-
self.assertTrue("deployment-time" in db_user_secret.metadata.annotations, "Added annotation was not propagated to secret")
1885+
self.assertTrue("environment" in db_user_secret.metadata.annotations, "Added annotation was not propagated to secret")
18851886

18861887
# disable password rotation for all other users (foo_user)
18871888
# and pick smaller intervals to see if the third fake rotation user is dropped
@@ -2120,7 +2121,7 @@ def test_statefulset_annotation_propagation(self):
21202121
patch_sset_propagate_annotations = {
21212122
"data": {
21222123
"downscaler_annotations": "deployment-time,downscaler/*",
2123-
"inherited_annotations": "owned-by",
2124+
"inherited_annotations": "environment,owned-by",
21242125
}
21252126
}
21262127
k8s.update_config(patch_sset_propagate_annotations)

0 commit comments

Comments
 (0)