KEP-29: Handle changed dependencies when upgrading operators #1558
Conversation
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
nfnt
commented
Jun 11, 2020
nfnt
commented
Jun 11, 2020
nfnt
changed the title
zen-dog
reviewed
Jun 11, 2020
| // Dependencies are resolved recursively. | ||
| // Cyclic dependencies are detected and result in an error. | ||
| func gatherDependencies(root packages.Resources, resolver pkgresolver.Resolver) ([]packages.Resources, error) { | ||
| func Resolve(root packages.Resources, resolver pkgresolver.Resolver) ([]packages.Resources, error) { |
There was a problem hiding this comment.
I'm not sure about this renaming. So far Resolve methods in KUDOs codebase were implementations of the Resolver interface. But then again the name sort of fits 🤔
| @@ -68,25 +70,27 @@ func Package( | |||
| dependency.Operator.SetNamespace(namespace) | |||
| dependency.OperatorVersion.SetNamespace(namespace) | |||
|
|
|||
| if err := installOperatorAndOperatorVersion(client, dependency); err != nil { | |||
| if err := install.OperatorAndOperatorVersion( | |||
There was a problem hiding this comment.
Are you coding in 80 characters wide terminal? ^.^
There was a problem hiding this comment.
120 chars. But having long single lines decreases readability, because one may need to scroll and then loses context of the surrounding lines.
added 2 commits
June 22, 2020 12:31
When upgrading operators with dependencies, its dependencies could have changed. In this case the Operator and OperatorVersion resources of the new dependencies are installed. Outdated OperatorVersion resources aren't removed. The code was refactored to decouple dependency handling from package installation and have separate packages to install and upgrade KUDO resources. Signed-off-by: Jan Schlicht <jan@d2iq.com>
Signed-off-by: Jan Schlicht <jan@d2iq.com>
Signed-off-by: Jan Schlicht <jan@d2iq.com>
zen-dog
requested changes
Jun 22, 2020
Signed-off-by: Jan Schlicht <jan@d2iq.com>
Signed-off-by: Aleksey Dukhovniy <alex.dukhovniy@googlemail.com>
Operator installation has been refactored to include dependency handling. Hence, upgrades are delegating dependency handling to O/OV installation. Signed-off-by: Jan Schlicht <jan@d2iq.com>
nfnt
commented
Jun 23, 2020
| } | ||
|
|
||
| if !funk.ContainsString(versionsInstalled, operatorVersion.Spec.Version) { | ||
| if err := installDependencies(client, operatorVersion, resolver); err != nil { |
There was a problem hiding this comment.
Dependencies are now handled directly in install.OperatorAndOperatorVersion. This function is called when installing packages (install.Package) as well as upgrading OVs (upgrade.OperatorVersion).
zen-dog
reviewed
Jun 23, 2020
Signed-off-by: Jan Schlicht <jan@d2iq.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
When upgrading operators with dependencies, its dependencies could have changed. In this case the Operator and OperatorVersion resources of the new dependencies are installed. Outdated OperatorVersion resources aren't removed.
The code was refactored to decouple dependency handling from package installation and have separate packages to install and upgrade KUDO resources.
Refactorings:
kudoctl/packages/installtokudoctl/resources/dependencieskudoctl/packages/installtokudoctl/resources/installkudoctl/util/kudotokudoctl/resources/upgradeFixes #1514