covidnetes/woodpecker-autoscaler
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 3 Wiki Activity

hopefully fix time comparison #9

Merged
lerentis merged 1 commits from bugfix/tt/costoptimizedmode into main 2024-02-03 23:14:55 +00:00
Conversation 0 Commits 1 Files Changed 2 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb1a931b4c - Show all commits

6
cmd/woodpecker-autoscaler.go
View File

@ -85,13 +85,13 @@ func Decom(cfg *config.Config, ownedNodes []hcloud.Server) {
} }
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"Caller": "Decom", "Caller": "Decom",
}).Debugf("Node %s is running for %f", server.Name, runtime.Minutes()) }).Debugf("Node %s is running for %d", server.Name, runtime.Minute())
// Check if next check if sooner than the 60 Minute mark of the next hetzner check // Check if next check if sooner than the 60 Minute mark of the next hetzner check
// https://docs.hetzner.com/cloud/billing/faq/#how-do-you-bill-your-servers // https://docs.hetzner.com/cloud/billing/faq/#how-do-you-bill-your-servers
if (runtime + time.Duration(cfg.CheckInterval)*time.Minute) < 60 { if time.Duration(runtime.Add(time.Duration(cfg.CheckInterval)*time.Minute).Minute()) < (60 * time.Minute) {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"Caller": "Decom", "Caller": "Decom",
}).Infof("Skipping node termination of %s (running for %f Minutes) in Cost Optimized Mode", server.Name, runtime.Minutes()) }).Infof("Skipping node termination of %s (running for %d Minutes) in Cost Optimized Mode", server.Name, runtime.Minute())
continue continue
} }
} }

6
internal/hetzner/hetzneragent.go
View File

@ -175,11 +175,11 @@ func RefreshNodeInfo(cfg *config.Config, serverID int) (*hcloud.Server, error) {
return server, nil return server, nil
} }
func CheckRuntime(cfg *config.Config, server *hcloud.Server) (time.Duration, error) { func CheckRuntime(cfg *config.Config, server *hcloud.Server) (time.Time, error) {
server, err := RefreshNodeInfo(cfg, server.ID) server, err := RefreshNodeInfo(cfg, server.ID)
now := time.Now() now := time.Now()
if err != nil { if err != nil {
return time.Duration(0), errors.New(fmt.Sprintf("Could not check Runtime: %s", err.Error())) return time.Time{}, errors.New(fmt.Sprintf("Could not check Runtime: %s", err.Error()))
} }
return server.Created.Sub(now), nil return server.Created.Add(time.Duration(now.Minute())), nil
} }