feat: support external dependencies for deploy-dependency and delete-dependency annotations#617
Merged
Merged
Conversation
…dependency annotations Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com>
Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com>
Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com>
| type Dependency struct { | ||
| *spec.ResourceMatcher `json:"resourceMatcher"` | ||
|
|
||
| ResourceMeta *spec.ResourceMeta `json:"resourceMeta"` |
Member
There was a problem hiding this comment.
You have both ResourceMatcher and ResourceMeta, bad/unclear design
|
|
||
| if dep.External { | ||
| dep.MinMatches = 1 | ||
| dep.MaxMatches = 30 |
Member
There was a problem hiding this comment.
move these as constants to common pkg
|
|
||
| if dep.External { | ||
| dep.MinMatches = 1 | ||
| dep.MaxMatches = 30 |
| switch pv := propVal.(type) { | ||
| case string: | ||
| switch pv { | ||
| case "auto", "true", "false": |
Member
There was a problem hiding this comment.
to constants to common pkg, and use them everywhere in this PR
| } | ||
|
|
||
| // Catches validation error for External delete dependencies | ||
| if _, err := manualDeleteDependencies(res.ResourceMeta, otherResourceMetaList, releaseNamespace); err != nil { |
Member
There was a problem hiding this comment.
if we do separately validateDeploy(Delete)Dependencies, can't we write manualDeploy(Delete)Dependencies in a way that they rely on the previous call of validate... functions? So that inside manualDeploy(Delete)Dependencies we often won't check errors (panic instead), etc, so no error will be returned at all? Look at how we do other functions like this where validate is separate
…ons, apply review suggestions Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com>
Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com> # Conflicts: # pkg/action/release_uninstall.go
Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com> # Conflicts: # pkg/resource/resource.go
Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com>
ilya-lesikov
approved these changes
May 17, 2026
Comment on lines
+113
to
+115
| DependencyExternalAuto = "auto" | ||
| DependencyExternalFalse = "false" | ||
| DependencyExternalTrue = "true" |
Member
There was a problem hiding this comment.
Make a type DependencyExternal string for those
| var manDeps []*Dependency | ||
| if err := validateDeleteDependencies(resourceSpec.ResourceMeta); err == nil { | ||
| manDeps, _ = manualDeleteDependencies(resourceSpec.ResourceMeta, otherResourceMetaList, releaseNamespace) | ||
| if err := validateDeleteDependencies(resourceSpec.ResourceMeta, otherResourceMetaList); err == nil { |
Member
There was a problem hiding this comment.
Huh? We should fail here if err != nil
Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com> # Conflicts: # pkg/common/common.go # pkg/resource/resource_test.go
Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.