diff --git a/scripts/generate-patch b/scripts/generate-patch index f60d56095..a15951aec 100755 --- a/scripts/generate-patch +++ b/scripts/generate-patch @@ -67,12 +67,6 @@ for f in packages/*; do if [[ "${split_crds}" == "true" ]]; then ./scripts/clean-crds ${f} fi - providesGVR="$(cat ${f}/package.yaml | yq r - providesGVR)" - if ! [[ -z ${providesGVR} ]]; then - if [[ "$(yq r ${f}/charts/Chart.yaml 'annotations[catalog.cattle.io/provides-gvr]')" == "${providesGVR}" ]]; then - yq d -i ${f}/charts/Chart.yaml "annotations[catalog.cattle.io/provides-gvr]" - fi - fi diff -x *.tgz -x *.lock -uNr ${f}/charts-original ${f}/charts > ${f}/$(basename -- ${f}).patch || true if ! [[ -s ${f}/$(basename -- ${f}).patch ]]; then # If no changes exist in patch then remove it diff --git a/scripts/prepare b/scripts/prepare index 24391a4d0..69308089a 100755 --- a/scripts/prepare +++ b/scripts/prepare @@ -44,13 +44,6 @@ for f in packages/*; do if [[ "${split_crds}" == "true" ]]; then ./scripts/prepare-crds ${f} fi - # Add provides GVR annotation, this lets other charts require it - providesGVR="$(cat ${f}/package.yaml | yq r - providesGVR)" - if ! [[ -z ${providesGVR} ]]; then - if [[ -z "$(yq r ${f}/charts/Chart.yaml 'annotations[catalog.cattle.io/provides-gvr]')" ]]; then - yq w -i ${f}/charts/Chart.yaml "annotations[catalog.cattle.io/provides-gvr]" "${providesGVR}" - fi - fi fi fi done