diff --git a/ossm/merge_upstream.sh b/ossm/merge_upstream.sh index 4d08224c08..7dd4be244e 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