From 8ecff63a774139c6187f8a4b8336d25849482a2d Mon Sep 17 00:00:00 2001 From: everettraven Date: Tue, 11 Jun 2024 16:27:20 -0400 Subject: [PATCH 1/2] allow duplicates in k8s_yaml Signed-off-by: everettraven --- Tiltfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tiltfile b/Tiltfile index 9ac3eb4..00564f1 100644 --- a/Tiltfile +++ b/Tiltfile @@ -120,7 +120,7 @@ def process_yaml(yaml): c['image'] = '{}:{}'.format(image_without_tag, command) # Now apply all the yaml - k8s_yaml(encode_yaml_stream(objects)) + k8s_yaml(encode_yaml_stream(objects), allow_duplicates=True) # data format: From de69d9321a492b052d6fe750bcc3eed0439dd23e Mon Sep 17 00:00:00 2001 From: everettraven Date: Thu, 13 Jun 2024 09:41:39 -0400 Subject: [PATCH 2/2] update comment Signed-off-by: everettraven --- Tiltfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tiltfile b/Tiltfile index 00564f1..d7b4841 100644 --- a/Tiltfile +++ b/Tiltfile @@ -120,6 +120,10 @@ def process_yaml(yaml): c['image'] = '{}:{}'.format(image_without_tag, command) # Now apply all the yaml + # We are using allow_duplicates=True here as both + # operator-controller and catalogd will be installed in the same + # namespace "olmv1-system" as of https://github.com/operator-framework/operator-controller/pull/888 + # and https://github.com/operator-framework/catalogd/pull/283 k8s_yaml(encode_yaml_stream(objects), allow_duplicates=True)