Skip to content

Commit 9b00b5d

Browse files
committed
update deps
1 parent e669b7b commit 9b00b5d

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ require (
77
github.com/charmbracelet/bubbles v0.16.1
88
github.com/charmbracelet/bubbletea v0.24.2
99
github.com/charmbracelet/lipgloss v0.7.1
10-
github.com/samber/lo v1.38.1
1110
go.uber.org/multierr v1.11.0
1211
k8s.io/api v0.27.4
1312
k8s.io/apimachinery v0.27.4
14-
k8s.io/client-go v0.27.3
13+
k8s.io/client-go v0.27.4
1514
)
1615

1716
require (
@@ -48,7 +47,6 @@ require (
4847
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4948
github.com/rivo/uniseg v0.2.0 // indirect
5049
github.com/spf13/pflag v1.0.5 // indirect
51-
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
5250
golang.org/x/net v0.8.0 // indirect
5351
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
5452
golang.org/x/sync v0.1.0 // indirect

go.sum

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
201201
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
202202
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
203203
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
204-
github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
205-
github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
206204
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
207205
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
208206
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
@@ -244,8 +242,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
244242
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
245243
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
246244
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
247-
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
248-
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
249245
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
250246
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
251247
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -527,8 +523,8 @@ k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs=
527523
k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y=
528524
k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs=
529525
k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
530-
k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8=
531-
k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48=
526+
k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk=
527+
k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc=
532528
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
533529
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
534530
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=

pkg/pricing/pricing.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
3333
"github.com/aws/aws-sdk-go/service/pricing"
3434
"github.com/aws/aws-sdk-go/service/pricing/pricingiface"
35-
"github.com/samber/lo"
3635
"go.uber.org/multierr"
3736
)
3837

@@ -130,13 +129,6 @@ func NewProvider(ctx context.Context, sess *session.Session, notify func()) *Pro
130129
return p
131130
}
132131

133-
// InstanceTypes returns the list of all instance types for which either a spot or on-demand price is known.
134-
func (p *Provider) InstanceTypes() []string {
135-
p.mu.RLock()
136-
defer p.mu.RUnlock()
137-
return lo.Union(lo.Keys(p.onDemandPrices), lo.Keys(p.spotPrices))
138-
}
139-
140132
// OnDemandLastUpdated returns the time that the on-demand pricing was last updated
141133
func (p *Provider) OnDemandLastUpdated() time.Time {
142134
p.mu.RLock()
@@ -269,7 +261,12 @@ func (p *Provider) updateOnDemandPricing(ctx context.Context) error {
269261
p.mu.Lock()
270262
defer p.mu.Unlock()
271263

272-
p.onDemandPrices = lo.Assign(onDemandPrices, onDemandMetalPrices)
264+
p.onDemandPrices = map[string]float64{}
265+
for _, m := range []map[string]float64{onDemandPrices, onDemandMetalPrices} {
266+
for k, v := range m {
267+
p.onDemandPrices[k] = v
268+
}
269+
}
273270
p.onDemandUpdateTime = time.Now()
274271
return nil
275272
}

0 commit comments

Comments
 (0)