Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow custom version for cloudnative (#4110) #4119

Merged
merged 2 commits into from
Nov 28, 2024
Merged

Allow custom version for cloudnative (#4110) #4119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9bf53b
Allow custom version for cloudnative (#4110)
gkrenn Nov 28, 2024
7b24dc4
Merge branch 'release-1.4' into cherry/custom-v
0sewa0 Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pkg/api/v1beta3/dynakube/oneagent_props.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,6 @@ func (dk *DynaKube) CustomCodeModulesImage() string {

// CustomCodeModulesVersion provides the version for the CodeModules provided in the Spec.
func (dk *DynaKube) CustomCodeModulesVersion() string {
if !dk.ApplicationMonitoringMode() {
return ""
}

return dk.CustomOneAgentVersion()
}

Expand Down
5 changes: 2 additions & 3 deletions pkg/controllers/dynakube/version/updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ func (r *reconciler) run(ctx context.Context, updater StatusUpdater) error {
}
}()

customImage := updater.CustomImage()
if customImage != "" {
if currentSource == status.CustomImageVersionSource {
log.Info("updating version status according to custom image", "updater", updater.Name())
setImageIDToCustomImage(updater.Target(), customImage)
setImageIDToCustomImage(updater.Target(), updater.CustomImage())

return nil
}
Expand Down
Loading