kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant type assertions

This commit is contained in:
Peter Rifel 2025-08-22 20:27:52 -05:00
parent 669c47c4ed
commit dc8f27f356
No known key found for this signature in database
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/pkg/fi/cloudup/scalewaytasks/dns_record.go
View File

@ -112,10 +112,8 @@ func (_ *DNSRecord) CheckChanges(actual, expected, changes *DNSRecord) error {
} }
func (d *DNSRecord) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *DNSRecord) error { func (d *DNSRecord) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *DNSRecord) error {
cloud := t.Cloud.(scaleway.ScwCloud)
if actual != nil { if actual != nil {
recordUpdated, err := cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{ recordUpdated, err := t.Cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{
DNSZone: fi.ValueOf(actual.DNSZone), DNSZone: fi.ValueOf(actual.DNSZone),
Changes: []*domain.RecordChange{ Changes: []*domain.RecordChange{
{ {
@ -138,7 +136,7 @@ func (d *DNSRecord) RenderScw(t *scaleway.ScwAPITarget, actual, expected, change
return nil return nil
} }
recordCreated, err := cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{ recordCreated, err := t.Cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{
DNSZone: fi.ValueOf(expected.DNSZone), DNSZone: fi.ValueOf(expected.DNSZone),
Changes: []*domain.RecordChange{ Changes: []*domain.RecordChange{
{ {

9
upup/pkg/fi/cloudup/scalewaytasks/instance.go
View File

@ -175,8 +175,7 @@ func (_ *Instance) CheckChanges(actual, expected, changes *Instance) error {
} }
func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *Instance) error { func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *Instance) error {
cloud := t.Cloud.(scaleway.ScwCloud) instanceService := t.Cloud.InstanceService()
instanceService := cloud.InstanceService()
zone := scw.Zone(fi.ValueOf(expected.Zone)) zone := scw.Zone(fi.ValueOf(expected.Zone))
userData, err := fi.ResourceAsBytes(*expected.UserData) userData, err := fi.ResourceAsBytes(*expected.UserData)
@ -216,7 +215,7 @@ func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes
// If newInstanceCount > 0, we need to create new instances for this group // If newInstanceCount > 0, we need to create new instances for this group
for i := 0; i < newInstanceCount; i++ { for i := 0; i < newInstanceCount; i++ {
// We create a unique name for each server // We create a unique name for each server
uniqueName, err := uniqueName(cloud, scaleway.ClusterNameFromTags(expected.Tags), fi.ValueOf(expected.Name)) uniqueName, err := uniqueName(t.Cloud, scaleway.ClusterNameFromTags(expected.Tags), fi.ValueOf(expected.Name))
if err != nil { if err != nil {
return fmt.Errorf("error rendering server group %s: computing unique name for server: %w", fi.ValueOf(expected.Name), err) return fmt.Errorf("error rendering server group %s: computing unique name for server: %w", fi.ValueOf(expected.Name), err)
} }
@ -288,14 +287,14 @@ func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes
// If newInstanceCount < 0, we need to delete instances of this group // If newInstanceCount < 0, we need to delete instances of this group
if newInstanceCount < 0 { if newInstanceCount < 0 {
igInstances, err := cloud.GetClusterServers(cloud.ClusterName(actual.Tags), actual.Name) igInstances, err := t.Cloud.GetClusterServers(t.Cloud.ClusterName(actual.Tags), actual.Name)
if err != nil { if err != nil {
return fmt.Errorf("error deleting instance: %w", err) return fmt.Errorf("error deleting instance: %w", err)
} }
for i := 0; i > newInstanceCount; i-- { for i := 0; i > newInstanceCount; i-- {
toDelete := igInstances[i*-1] toDelete := igInstances[i*-1]
err = cloud.DeleteServer(toDelete) err = t.Cloud.DeleteServer(toDelete)
if err != nil { if err != nil {
return fmt.Errorf("error deleting instance of group %s: %w", toDelete.Name, err) return fmt.Errorf("error deleting instance of group %s: %w", toDelete.Name, err)
} }

4
upup/pkg/fi/cloudup/scalewaytasks/sshkey.go
View File

@ -114,8 +114,6 @@ func (*SSHKey) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *SS
return nil return nil
} }
cloud := t.Cloud.(scaleway.ScwCloud)
name := fi.ValueOf(expected.Name) name := fi.ValueOf(expected.Name)
if name == "" { if name == "" {
return fi.RequiredField("Name") return fi.RequiredField("Name")
@ -133,7 +131,7 @@ func (*SSHKey) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *SS
keyArgs.PublicKey = d keyArgs.PublicKey = d
} }
key, err := cloud.IamService().CreateSSHKey(keyArgs) key, err := t.Cloud.IamService().CreateSSHKey(keyArgs)
if err != nil { if err != nil {
return fmt.Errorf("error creating SSH keypair: %w", err) return fmt.Errorf("error creating SSH keypair: %w", err)
} }