Skip to content

Commit b19aa54

Browse files
Change forcePromote in v1alpha1 to a string
1 parent f02353f commit b19aa54

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

src/cloud-resources/src/crd/materialize.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ pub mod v1alpha1 {
163163
/// generation to rehydrate before promoting the new environmentd to
164164
/// leader.
165165
#[serde(default)]
166-
pub force_promote: Uuid,
166+
pub force_promote: String,
167167
/// This value will be written to an annotation in the generated
168168
/// environmentd statefulset, in order to force the controller to
169169
/// detect the generated resources as changed even if no other changes
@@ -282,7 +282,9 @@ pub mod v1alpha1 {
282282
force_promote: match value.spec.force_promote {
283283
Some(s) => Uuid::try_from(s).unwrap_or(Uuid::nil()),
284284
None => Uuid::nil(),
285-
},
285+
}
286+
.hyphenated()
287+
.to_string(),
286288
force_rollout: value.spec.force_rollout,
287289
// TODO either pull this out so they are the same type,
288290
// or add a timeout to the ManuallyPromote variant.
@@ -992,7 +994,9 @@ pub mod v1alpha2 {
992994
service_account_labels: value.spec.service_account_labels,
993995
pod_annotations: value.spec.pod_annotations,
994996
pod_labels: value.spec.pod_labels,
995-
force_promote: if value.spec.force_promote.is_nil() {
997+
force_promote: if value.spec.force_promote.is_empty()
998+
|| &value.spec.force_promote == "00000000-0000-0000-0000-000000000000"
999+
{
9961000
None
9971001
} else {
9981002
Some(value.spec.force_promote.to_string())

0 commit comments

Comments
 (0)