Skip to content

Commit b5419c3

Browse files
lgarber-akamailgarber-akamai
committed
fix conflicts
2 parents ca1c9b0 + ff17027 commit b5419c3

Some content is hidden

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

46 files changed

+2103
-957
lines changed

‎account_events.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,25 @@ type Event struct {
5252

5353
// The total duration in seconds that it takes for the Event to complete.
5454
Duration float64 `json:"duration"`
55+
56+
// The maintenance policy configured by the user for the event.
57+
// NOTE: MaintenancePolicySet can only be used with v4beta.
58+
MaintenancePolicySet string `json:"maintenance_policy_set"`
59+
60+
// Describes the nature of the event (e.g., whether it is scheduled or emergency).
61+
Description string `json:"description"`
62+
63+
// The origin of the event (e.g., platform, user).
64+
Source string `json:"source"`
65+
66+
// Scheduled start time for the event.
67+
NotBefore *time.Time `json:"-"`
68+
69+
// The actual start time of the event.
70+
StartTime *time.Time `json:"-"`
71+
72+
// The actual completion time of the event.
73+
CompleteTime *time.Time `json:"-"`
5574
}
5675

5776
// EventAction constants start with Action and include all known Linode API Event Actions.
@@ -121,6 +140,7 @@ const (
121140
ActionLinodeMigrateDatacenterCreate EventAction = "linode_migrate_datacenter_create"
122141
ActionLinodeMutate EventAction = "linode_mutate"
123142
ActionLinodeMutateCreate EventAction = "linode_mutate_create"
143+
ActionLinodePowerOffOn EventAction = "linode_poweroff_on"
124144
ActionLinodeReboot EventAction = "linode_reboot"
125145
ActionLinodeRebuild EventAction = "linode_rebuild"
126146
ActionLinodeResize EventAction = "linode_resize"
@@ -261,6 +281,7 @@ const (
261281
EventNotification EventStatus = "notification"
262282
EventScheduled EventStatus = "scheduled"
263283
EventStarted EventStatus = "started"
284+
EventCanceled EventStatus = "canceled"
264285
)
265286

266287
// EventEntity provides detailed information about the Event's
@@ -284,6 +305,9 @@ func (i *Event) UnmarshalJSON(b []byte) error {
284305

285306
Created *parseabletime.ParseableTime `json:"created"`
286307
TimeRemaining json.RawMessage `json:"time_remaining"`
308+
NotBefore *parseabletime.ParseableTime `json:"not_before"`
309+
StartTime *parseabletime.ParseableTime `json:"start_time"`
310+
CompleteTime *parseabletime.ParseableTime `json:"complete_time"`
287311
}{
288312
Mask: (*Mask)(i),
289313
}
@@ -294,6 +318,9 @@ func (i *Event) UnmarshalJSON(b []byte) error {
294318

295319
i.Created = (*time.Time)(p.Created)
296320
i.TimeRemaining = duration.UnmarshalTimeRemaining(p.TimeRemaining)
321+
i.NotBefore = (*time.Time)(p.NotBefore)
322+
i.StartTime = (*time.Time)(p.StartTime)
323+
i.CompleteTime = (*time.Time)(p.CompleteTime)
297324

298325
return nil
299326
}

‎account_maintenance.go

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,22 @@ import (
1010

1111
// AccountMaintenance represents a Maintenance object for any entity a user has permissions to view
1212
type AccountMaintenance struct {
13-
Entity *Entity `json:"entity"`
14-
Reason string `json:"reason"`
15-
Status string `json:"status"`
16-
Type string `json:"type"`
17-
When *time.Time `json:"when"`
13+
Entity *Entity `json:"entity"`
14+
Reason string `json:"reason"`
15+
Status string `json:"status"`
16+
Type string `json:"type"`
17+
18+
// NOTE: MaintenancePolicySet can only be used with v4beta.
19+
MaintenancePolicySet string `json:"maintenance_policy_set"`
20+
21+
Description string `json:"description"`
22+
Source string `json:"source"`
23+
NotBefore *time.Time `json:"-"`
24+
StartTime *time.Time `json:"-"`
25+
CompleteTime *time.Time `json:"-"`
26+
27+
// Deprecated: When is a deprecated property
28+
When *time.Time `json:"when"`
1829
}
1930

2031
// The entity being affected by maintenance
@@ -32,7 +43,10 @@ func (accountMaintenance *AccountMaintenance) UnmarshalJSON(b []byte) error {
3243
p := struct {
3344
*Mask
3445

35-
When *parseabletime.ParseableTime `json:"when"`
46+
NotBefore *parseabletime.ParseableTime `json:"not_before"`
47+
StartTime *parseabletime.ParseableTime `json:"start_time"`
48+
CompleteTime *parseabletime.ParseableTime `json:"complete_time"`
49+
When *parseabletime.ParseableTime `json:"when"`
3650
}{
3751
Mask: (*Mask)(accountMaintenance),
3852
}
@@ -41,6 +55,9 @@ func (accountMaintenance *AccountMaintenance) UnmarshalJSON(b []byte) error {
4155
return err
4256
}
4357

58+
accountMaintenance.NotBefore = (*time.Time)(p.NotBefore)
59+
accountMaintenance.StartTime = (*time.Time)(p.StartTime)
60+
accountMaintenance.CompleteTime = (*time.Time)(p.CompleteTime)
4461
accountMaintenance.When = (*time.Time)(p.When)
4562

4663
return nil

‎account_notifications.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,17 @@ type NotificationType string
4444

4545
// NotificationType constants represent the actions that cause a Notification. New types may be added in the future.
4646
const (
47-
NotificationMigrationScheduled NotificationType = "migration_scheduled"
48-
NotificationMigrationImminent NotificationType = "migration_imminent"
49-
NotificationMigrationPending NotificationType = "migration_pending"
50-
NotificationRebootScheduled NotificationType = "reboot_scheduled"
51-
NotificationOutage NotificationType = "outage"
52-
NotificationPaymentDue NotificationType = "payment_due"
53-
NotificationTicketImportant NotificationType = "ticket_important"
54-
NotificationTicketAbuse NotificationType = "ticket_abuse"
55-
NotificationNotice NotificationType = "notice"
56-
NotificationMaintenance NotificationType = "maintenance"
47+
NotificationMigrationScheduled NotificationType = "migration_scheduled"
48+
NotificationMigrationImminent NotificationType = "migration_imminent"
49+
NotificationMigrationPending NotificationType = "migration_pending"
50+
NotificationRebootScheduled NotificationType = "reboot_scheduled"
51+
NotificationOutage NotificationType = "outage"
52+
NotificationPaymentDue NotificationType = "payment_due"
53+
NotificationTicketImportant NotificationType = "ticket_important"
54+
NotificationTicketAbuse NotificationType = "ticket_abuse"
55+
NotificationNotice NotificationType = "notice"
56+
NotificationMaintenance NotificationType = "maintenance"
57+
NotificationMaintenanceScheduled NotificationType = "maintenance_scheduled"
5758
)
5859

5960
// ListNotifications gets a collection of Notification objects representing important,

‎account_settings.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ type AccountSettings struct {
1818
// The default backups enrollment status for all new Linodes for all users on the account. When enabled, backups are mandatory per instance.
1919
BackupsEnabled bool `json:"backups_enabled"`
2020

21-
// Wether or not Linode Managed service is enabled for the account.
21+
// Whether or not Linode Managed service is enabled for the account.
2222
Managed bool `json:"managed"`
2323

24-
// Wether or not the Network Helper is enabled for all new Linode Instance Configs on the account.
24+
// Whether or not the Network Helper is enabled for all new Linode Instance Configs on the account.
2525
NetworkHelper bool `json:"network_helper"`
2626

2727
// A plan name like "longview-3"..."longview-100", or a nil value for to cancel any existing subscription plan.
@@ -33,6 +33,10 @@ type AccountSettings struct {
3333
// NOTE: Interfaces for new linode setting may not currently be available to all users.
3434
// A new configuration flag defines whether new Linodes can use Linode and/or legacy config interfaces.
3535
InterfacesForNewLinodes InterfacesForNewLinodes `json:"interfaces_for_new_linodes"`
36+
37+
// The slug of the maintenance policy associated with the account.
38+
// NOTE: MaintenancePolicy can only be used with v4beta.
39+
MaintenancePolicy string `json:"maintenance_policy"`
3640
}
3741

3842
// AccountSettingsUpdateOptions are the updateable account wide flags or plans that effect new resources.
@@ -46,6 +50,10 @@ type AccountSettingsUpdateOptions struct {
4650
// NOTE: Interfaces for new linode setting may not currently be available to all users.
4751
// A new configuration flag defines whether new Linodes can use Linode and/or legacy config interfaces.
4852
InterfacesForNewLinodes *InterfacesForNewLinodes `json:"interfaces_for_new_linodes"`
53+
54+
// The slug of the maintenance policy to set the account to.
55+
// NOTE: MaintenancePolicy can only be used with v4beta.
56+
MaintenancePolicy *string `json:"maintenance_policy,omitempty"`
4957
}
5058

5159
// GetAccountSettings gets the account wide flags or plans that effect new resources

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ require (
55
github.com/google/go-cmp v0.7.0
66
github.com/google/go-querystring v1.1.0
77
github.com/jarcoal/httpmock v1.4.0
8-
golang.org/x/net v0.42.0
8+
golang.org/x/net v0.43.0
99
golang.org/x/oauth2 v0.30.0
10-
golang.org/x/text v0.27.0
10+
golang.org/x/text v0.28.0
1111
gopkg.in/ini.v1 v1.66.6
1212
)
1313

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1515
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1616
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1717
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
18-
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
19-
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
18+
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
19+
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
2020
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
2121
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
22-
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
23-
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
22+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
23+
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
2424
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
2525
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
2626
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎instances.go

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ type Instance struct {
7878

7979
// Note: Linode interfaces may not currently be available to all users.
8080
InterfaceGeneration InterfaceGeneration `json:"interface_generation"`
81+
82+
// NOTE: MaintenancePolicy can only be used with v4beta.
83+
MaintenancePolicy string `json:"maintenance_policy"`
8184
}
8285

8386
// InstanceSpec represents a linode spec
@@ -218,6 +221,9 @@ type InstanceCreateOptions struct {
218221
Group string `json:"group,omitempty"`
219222

220223
IPv4 []string `json:"ipv4,omitempty"`
224+
225+
// NOTE: MaintenancePolicy can only be used with v4beta.
226+
MaintenancePolicy *string `json:"maintenance_policy,omitempty"`
221227
}
222228

223229
// InstanceCreatePlacementGroupOptions represents the placement group
@@ -237,6 +243,9 @@ type InstanceUpdateOptions struct {
237243

238244
// Deprecated: group is a deprecated property denoting a group label for the Linode.
239245
Group *string `json:"group,omitempty"`
246+
247+
// NOTE: MaintenancePolicy can only be used with v4beta.
248+
MaintenancePolicy *string `json:"maintenance_policy,omitempty"`
240249
}
241250

242251
// MarshalJSON contains logic necessary to populate the `interfaces` field of
@@ -363,12 +372,13 @@ func (backup *InstanceBackup) UnmarshalJSON(b []byte) error {
363372
// GetUpdateOptions converts an Instance to InstanceUpdateOptions for use in UpdateInstance
364373
func (i *Instance) GetUpdateOptions() InstanceUpdateOptions {
365374
return InstanceUpdateOptions{
366-
Label: i.Label,
367-
Group: &i.Group,
368-
Backups: i.Backups,
369-
Alerts: i.Alerts,
370-
WatchdogEnabled: &i.WatchdogEnabled,
371-
Tags: &i.Tags,
375+
Label: i.Label,
376+
Group: &i.Group,
377+
Backups: i.Backups,
378+
Alerts: i.Alerts,
379+
WatchdogEnabled: &i.WatchdogEnabled,
380+
Tags: &i.Tags,
381+
MaintenancePolicy: &i.MaintenancePolicy,
372382
}
373383
}
374384

‎k8s/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ require (
2929
github.com/modern-go/reflect2 v1.0.2 // indirect
3030
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3131
github.com/spf13/pflag v1.0.5 // indirect
32-
golang.org/x/net v0.42.0 // indirect
32+
golang.org/x/net v0.43.0 // indirect
3333
golang.org/x/oauth2 v0.30.0 // indirect
34-
golang.org/x/sys v0.34.0 // indirect
35-
golang.org/x/term v0.33.0 // indirect
36-
golang.org/x/text v0.27.0 // indirect
34+
golang.org/x/sys v0.35.0 // indirect
35+
golang.org/x/term v0.34.0 // indirect
36+
golang.org/x/text v0.28.0 // indirect
3737
golang.org/x/time v0.6.0 // indirect
3838
google.golang.org/protobuf v1.33.0 // indirect
3939
gopkg.in/inf.v0 v0.9.1 // indirect

‎k8s/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
9191
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9292
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9393
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
94-
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
95-
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
94+
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
95+
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
9696
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
9797
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
9898
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -101,22 +101,22 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
101101
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
102102
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
103103
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
104-
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
105-
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
106-
golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
107-
golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
104+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
105+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
106+
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
107+
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
108108
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
109109
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
110-
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
111-
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
110+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
111+
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
112112
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
113113
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
114114
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
115115
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
116116
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
117117
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
118-
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
119-
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
118+
golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
119+
golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
120120
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
121121
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
122122
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎lke_node_pools.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ type LKENodePool struct {
7272
Tags []string `json:"tags"`
7373
Labels LKENodePoolLabels `json:"labels"`
7474
Taints []LKENodePoolTaint `json:"taints"`
75+
Label *string `json:"label"`
7576

7677
Autoscaler LKENodePoolAutoscaler `json:"autoscaler"`
7778

@@ -92,6 +93,7 @@ type LKENodePoolCreateOptions struct {
9293
Tags []string `json:"tags"`
9394
Labels LKENodePoolLabels `json:"labels"`
9495
Taints []LKENodePoolTaint `json:"taints"`
96+
Label *string `json:"label,omitempty"`
9597

9698
Autoscaler *LKENodePoolAutoscaler `json:"autoscaler,omitempty"`
9799

@@ -107,6 +109,7 @@ type LKENodePoolUpdateOptions struct {
107109
Tags *[]string `json:"tags,omitempty"`
108110
Labels *LKENodePoolLabels `json:"labels,omitempty"`
109111
Taints *[]LKENodePoolTaint `json:"taints,omitempty"`
112+
Label *string `json:"label,omitempty"`
110113

111114
Autoscaler *LKENodePoolAutoscaler `json:"autoscaler,omitempty"`
112115

@@ -127,6 +130,7 @@ func (l LKENodePool) GetCreateOptions() (o LKENodePoolCreateOptions) {
127130
o.Autoscaler = &l.Autoscaler
128131
o.K8sVersion = l.K8sVersion
129132
o.UpdateStrategy = l.UpdateStrategy
133+
o.Label = l.Label
130134

131135
return
132136
}
@@ -140,6 +144,7 @@ func (l LKENodePool) GetUpdateOptions() (o LKENodePoolUpdateOptions) {
140144
o.Autoscaler = &l.Autoscaler
141145
o.K8sVersion = l.K8sVersion
142146
o.UpdateStrategy = l.UpdateStrategy
147+
o.Label = l.Label
143148

144149
return
145150
}

0 commit comments

Comments
 (0)