mirror of https://github.com/kubernetes/kops.git
fix staticcheck failures in pkg/resources
This commit is contained in:
parent
61d556f9e9
commit
8ebcea0024
|
@ -7,11 +7,9 @@ dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal
|
|||
dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal/stubs
|
||||
node-authorizer/pkg/authorizers/aws
|
||||
node-authorizer/pkg/server
|
||||
pkg/resources/ali
|
||||
pkg/resources/digitalocean
|
||||
pkg/resources/digitalocean/dns
|
||||
pkg/resources/openstack
|
||||
pkg/sshcredentials
|
||||
upup/pkg/fi
|
||||
upup/pkg/fi/cloudup
|
||||
upup/pkg/fi/cloudup/awstasks
|
||||
|
|
|
@ -59,9 +59,6 @@ type clusterDiscoveryALI struct {
|
|||
}
|
||||
|
||||
func ListResourcesALI(aliCloud aliup.ALICloud, clusterName string, region string) (map[string]*resources.Resource, error) {
|
||||
if region == "" {
|
||||
region = aliCloud.Region()
|
||||
}
|
||||
|
||||
resources := make(map[string]*resources.Resource)
|
||||
|
||||
|
@ -412,8 +409,6 @@ func (d *clusterDiscoveryALI) ListRam() ([]*resources.Resource, error) {
|
|||
"bastions-" + clusterName,
|
||||
}
|
||||
|
||||
roleToDelete := []string{}
|
||||
|
||||
response, err := d.aliCloud.RamClient().ListRoles()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("err listing RamRole:%v", err)
|
||||
|
@ -424,7 +419,6 @@ func (d *clusterDiscoveryALI) ListRam() ([]*resources.Resource, error) {
|
|||
for _, role := range response.Roles.Role {
|
||||
for _, roleName := range names {
|
||||
if role.RoleName == roleName {
|
||||
roleToDelete = append(roleToDelete, role.RoleId)
|
||||
resourceTracker := &resources.Resource{
|
||||
Name: role.RoleName,
|
||||
ID: role.RoleId,
|
||||
|
|
|
@ -5,8 +5,5 @@ go_library(
|
|||
srcs = ["fingerprint.go"],
|
||||
importpath = "k8s.io/kops/pkg/sshcredentials",
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//vendor/golang.org/x/crypto/ssh:go_default_library",
|
||||
"//vendor/k8s.io/klog:go_default_library",
|
||||
],
|
||||
deps = ["//vendor/golang.org/x/crypto/ssh:go_default_library"],
|
||||
)
|
||||
|
|
|
@ -22,7 +22,6 @@ import (
|
|||
"fmt"
|
||||
|
||||
"golang.org/x/crypto/ssh"
|
||||
"k8s.io/klog"
|
||||
)
|
||||
|
||||
func Fingerprint(pubkey string) (string, error) {
|
||||
|
@ -53,26 +52,3 @@ func formatFingerprint(data []byte) string {
|
|||
}
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
func insertFingerprintColons(id string) string {
|
||||
remaining := id
|
||||
|
||||
var buf bytes.Buffer
|
||||
for {
|
||||
if remaining == "" {
|
||||
break
|
||||
}
|
||||
if buf.Len() != 0 {
|
||||
buf.WriteString(":")
|
||||
}
|
||||
if len(remaining) < 2 {
|
||||
klog.Warningf("unexpected format for SSH public key id: %q", id)
|
||||
buf.WriteString(remaining)
|
||||
break
|
||||
} else {
|
||||
buf.WriteString(remaining[0:2])
|
||||
remaining = remaining[2:]
|
||||
}
|
||||
}
|
||||
return buf.String()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue