|
|
|
@ -112,7 +112,7 @@ func requireValue(meta map[string]string, k, v string) error {
|
|
|
|
|
// setMetadataVisitor adds release tracking metadata to all resources. If force is enabled, existing
|
|
|
|
|
// ownership metadata will be overwritten. Otherwise an error will be returned if any resource has an
|
|
|
|
|
// existing and conflicting value for the managed by label or Helm release/namespace annotations.
|
|
|
|
|
func setMetadataVisitor(releaseName, releaseNamespace string, force bool) resource.VisitorFunc {
|
|
|
|
|
func setMetadataVisitor(releaseName, releaseNamespace string, releaseLabels map[string]string, force bool) resource.VisitorFunc {
|
|
|
|
|
return func(info *resource.Info, err error) error {
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
@ -124,9 +124,8 @@ func setMetadataVisitor(releaseName, releaseNamespace string, force bool) resour
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err := mergeLabels(info.Object, map[string]string{
|
|
|
|
|
appManagedByLabel: appManagedByHelm,
|
|
|
|
|
}); err != nil {
|
|
|
|
|
releaseLabels[appManagedByLabel] = appManagedByHelm
|
|
|
|
|
if err := mergeLabels(info.Object, releaseLabels); err != nil {
|
|
|
|
|
return fmt.Errorf(
|
|
|
|
|
"%s labels could not be updated: %s",
|
|
|
|
|
resourceString(info), err,
|
|
|
|
|