-
Notifications
You must be signed in to change notification settings - Fork 7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(action): Protects against current resource conflicts
Currently, if using the --atomic flag or deleting a release that failed due to an already existing resource, Helm will deleting those resources that aren't managed by it. This PR fixes the issue by checking for pre-existing resources during install and upgrade. This is done as a validation step so the release will not even be started if resources currently exist. This PR is inspired by @xchapter7x's work in #3477. This also fixes a small bug in upgrade where deletes fail if the resource was already deletes Fixes #6407 Signed-off-by: Taylor Thomas <taylor.thomas@microsoft.com>
- Loading branch information
1 parent
0ca3840
commit 36f3a4b
Showing
4 changed files
with
92 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/* | ||
Copyright The Helm Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package action | ||
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/pkg/errors" | ||
apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
"k8s.io/cli-runtime/pkg/resource" | ||
|
||
"helm.sh/helm/pkg/kube" | ||
) | ||
|
||
func existingResourceConflict(resources kube.ResourceList) error { | ||
err := resources.Visit(func(info *resource.Info, err error) error { | ||
if err != nil { | ||
return err | ||
} | ||
|
||
helper := resource.NewHelper(info.Client, info.Mapping) | ||
if _, err := helper.Get(info.Namespace, info.Name, info.Export); err != nil { | ||
if apierrors.IsNotFound(err) { | ||
return nil | ||
} | ||
|
||
return errors.Wrap(err, "could not get information about the resource") | ||
} | ||
|
||
return fmt.Errorf("existing resource conflict: kind: %s, namespace: %s, name: %s", info.Mapping.GroupVersionKind.Kind, info.Namespace, info.Name) | ||
}) | ||
return err | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters