@@ -1814,6 +1814,7 @@ def test_password_rotation(self):
1814
1814
enable_password_rotation = {
1815
1815
"data" : {
1816
1816
"enable_password_rotation" : "true" ,
1817
+ "inherited_annotations" : "environment" ,
1817
1818
"password_rotation_interval" : "30" ,
1818
1819
"password_rotation_user_retention" : "30" , # should be set to 60
1819
1820
},
@@ -1864,7 +1865,7 @@ def test_password_rotation(self):
1864
1865
pg_annotation_patch = {
1865
1866
"metadata" : {
1866
1867
"annotations" : {
1867
- "deployment-time " : "2020-04-01 12:00:00 " ,
1868
+ "environment " : "test " ,
1868
1869
}
1869
1870
}
1870
1871
}
@@ -1881,7 +1882,7 @@ def test_password_rotation(self):
1881
1882
"Unexpected username in secret of test.db_user: expected {}, got {}" .format ("test.db_user" , secret_username ))
1882
1883
1883
1884
# 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" )
1885
1886
1886
1887
# disable password rotation for all other users (foo_user)
1887
1888
# and pick smaller intervals to see if the third fake rotation user is dropped
@@ -2120,7 +2121,7 @@ def test_statefulset_annotation_propagation(self):
2120
2121
patch_sset_propagate_annotations = {
2121
2122
"data" : {
2122
2123
"downscaler_annotations" : "deployment-time,downscaler/*" ,
2123
- "inherited_annotations" : "owned-by" ,
2124
+ "inherited_annotations" : "environment, owned-by" ,
2124
2125
}
2125
2126
}
2126
2127
k8s .update_config (patch_sset_propagate_annotations )
0 commit comments