From 9f6c224b6d68c1c4cc373e4486dfb416b457e70a Mon Sep 17 00:00:00 2001 From: Filip Brychta Date: Wed, 4 Feb 2026 17:23:15 +0100 Subject: [PATCH] Do not remove everything from resources directory (#667) https://github.com/istio-ecosystem/sail-operator/pull/1561 added new file to resources directory so we can't remove everything. We want to remove just charts. --- ossm/merge_upstream.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ossm/merge_upstream.sh b/ossm/merge_upstream.sh index 4d08224c0..7dd4be244 100755 --- a/ossm/merge_upstream.sh +++ b/ossm/merge_upstream.sh @@ -72,9 +72,9 @@ main () { set -e # generate everything regardless of detected conflicts - rm -rf bundle/**/*.yaml resources bundle.Dockerfile - # TODO, fix this to add versions not replacing them + rm -rf bundle/**/*.yaml resources/v* bundle.Dockerfile #updateVersionsInOssmValuesYaml + # even if we specify ossm/values.yaml via HELM_VALUES_FILE, helm by design merges annotations specified in chart/values.yaml and ossm/values.yaml # to only keep annotations specified in ossm/values.yaml, it's necessary to overwrite all annotations in chart/values.yaml yq -i '.deployment.annotations = {}' chart/values.yaml