Skip to content

Commit 62ed422

Browse files
authored
Merge pull request #17586 from hakman/amazon-ec2-instance-selector-v3.1.1
Update amazon-ec2-instance-selector to v3.1.1
2 parents cd4d7ae + 60ab99c commit 62ed422

File tree

258 files changed

+32933
-8318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+32933
-8318
lines changed

cmd/kops/toolbox_instance-selector.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"io"
2323
"strings"
2424

25-
"github.com/aws/amazon-ec2-instance-selector/v2/pkg/cli"
26-
"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
25+
"github.com/aws/amazon-ec2-instance-selector/v3/pkg/cli"
26+
"github.com/aws/amazon-ec2-instance-selector/v3/pkg/selector"
2727
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
2828
"github.com/spf13/cobra"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

cmd/kops/toolbox_instance-selector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"regexp"
2222
"testing"
2323

24-
"github.com/aws/amazon-ec2-instance-selector/v2/pkg/cli"
24+
"github.com/aws/amazon-ec2-instance-selector/v3/pkg/cli"
2525
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
2626
"k8s.io/kops/pkg/apis/kops"
2727
)

go.mod

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/MakeNowJust/heredoc/v2 v2.0.1
1919
github.com/Masterminds/sprig/v3 v3.3.0
2020
github.com/apparentlymart/go-cidr v1.1.0
21-
github.com/aws/amazon-ec2-instance-selector/v2 v2.4.2-0.20231216170552-14d4dfcbaadf
21+
github.com/aws/amazon-ec2-instance-selector/v3 v3.1.1
2222
github.com/aws/aws-sdk-go-v2 v1.36.5
2323
github.com/aws/aws-sdk-go-v2/config v1.29.17
2424
github.com/aws/aws-sdk-go-v2/credentials v1.17.70
@@ -123,17 +123,18 @@ require (
123123
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
124124
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
125125
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
126-
github.com/aws/aws-sdk-go-v2/service/pricing v1.21.6 // indirect
126+
github.com/aws/aws-sdk-go-v2/service/pricing v1.32.17 // indirect
127127
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
128128
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
129129
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
130130
github.com/beorn7/perks v1.0.1 // indirect
131131
github.com/cespare/xxhash/v2 v2.3.0 // indirect
132132
github.com/chai2010/gettext-go v1.0.2 // indirect
133-
github.com/charmbracelet/bubbles v0.16.1 // indirect
134-
github.com/charmbracelet/bubbletea v0.24.2 // indirect
135-
github.com/charmbracelet/lipgloss v0.7.1 // indirect
136-
github.com/containerd/console v1.0.4 // indirect
133+
github.com/charmbracelet/bubbles v0.20.0 // indirect
134+
github.com/charmbracelet/bubbletea v1.3.3 // indirect
135+
github.com/charmbracelet/lipgloss v1.0.0 // indirect
136+
github.com/charmbracelet/x/ansi v0.8.0 // indirect
137+
github.com/charmbracelet/x/term v0.2.1 // indirect
137138
github.com/containerd/containerd v1.7.27 // indirect
138139
github.com/containerd/errdefs v1.0.0 // indirect
139140
github.com/containerd/log v0.1.0 // indirect
@@ -146,9 +147,10 @@ require (
146147
github.com/docker/docker-credential-helpers v0.9.3 // indirect
147148
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 // indirect
148149
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
150+
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
149151
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
150152
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
151-
github.com/evertras/bubble-table v0.15.2 // indirect
153+
github.com/evertras/bubble-table v0.17.1 // indirect
152154
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
153155
github.com/felixge/httpsnoop v1.0.4 // indirect
154156
github.com/fsnotify/fsnotify v1.8.0 // indirect
@@ -183,7 +185,6 @@ require (
183185
github.com/hashicorp/golang-lru v0.5.4 // indirect
184186
github.com/hashicorp/memberlist v0.3.1 // indirect
185187
github.com/huandu/xstrings v1.5.0 // indirect
186-
github.com/imdario/mergo v0.3.16 // indirect
187188
github.com/inconshreveable/mousetrap v1.1.0 // indirect
188189
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
189190
github.com/josharian/intern v1.0.0 // indirect
@@ -196,7 +197,7 @@ require (
196197
github.com/mailru/easyjson v0.9.0 // indirect
197198
github.com/mattn/go-isatty v0.0.20 // indirect
198199
github.com/mattn/go-localereader v0.0.1 // indirect
199-
github.com/mattn/go-runewidth v0.0.14 // indirect
200+
github.com/mattn/go-runewidth v0.0.16 // indirect
200201
github.com/miekg/dns v1.1.62 // indirect
201202
github.com/mitchellh/copystructure v1.2.0 // indirect
202203
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -209,10 +210,10 @@ require (
209210
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
210211
github.com/modern-go/reflect2 v1.0.2 // indirect
211212
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
212-
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
213+
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
213214
github.com/muesli/cancelreader v0.2.2 // indirect
214215
github.com/muesli/reflow v0.3.0 // indirect
215-
github.com/muesli/termenv v0.15.2 // indirect
216+
github.com/muesli/termenv v0.16.0 // indirect
216217
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
217218
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
218219
github.com/oklog/ulid v1.3.1 // indirect
@@ -228,10 +229,10 @@ require (
228229
github.com/prometheus/client_model v0.6.2 // indirect
229230
github.com/prometheus/common v0.62.0 // indirect
230231
github.com/prometheus/procfs v0.15.1 // indirect
231-
github.com/rivo/uniseg v0.2.0 // indirect
232+
github.com/rivo/uniseg v0.4.7 // indirect
232233
github.com/russross/blackfriday/v2 v2.1.0 // indirect
233234
github.com/sagikazarmark/locafero v0.7.0 // indirect
234-
github.com/sahilm/fuzzy v0.1.0 // indirect
235+
github.com/sahilm/fuzzy v0.1.1 // indirect
235236
github.com/samber/lo v1.50.0 // indirect
236237
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
237238
github.com/shopspring/decimal v1.4.0 // indirect

0 commit comments

Comments
 (0)