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

Merge pull request #8188 from Aresforchina/fix-pkg-resources-aws 

pkg/resources/aws:simplify code and remove code
This commit is contained in:
Kubernetes Prow Robot 2019-12-23 16:19:29 -08:00 committed by GitHub
parent 6fd4762290 8f86a1b201
commit 61d556f9e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -8,7 +8,6 @@ dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal/stubs
node-authorizer/pkg/authorizers/aws
node-authorizer/pkg/server
pkg/resources/ali
pkg/resources/aws
pkg/resources/digitalocean
pkg/resources/digitalocean/dns
pkg/resources/openstack

50
pkg/resources/aws/aws.go
View File

@ -17,8 +17,6 @@ limitations under the License.
package aws
import (
"bufio"
"bytes"
"errors"
"fmt"
"strings"
@ -1361,54 +1359,6 @@ func FindNatGateways(cloud fi.Cloud, routeTables map[string]*resources.Resource,
return resourceTrackers, nil
}
// extractClusterName performs string-matching / parsing to determine the ClusterName in some instance-data
// It returns "" if it could not be (uniquely) determined
func extractClusterName(userData string) string {
clusterName := ""
scanner := bufio.NewScanner(bytes.NewReader([]byte(userData)))
scanner.Split(bufio.ScanLines)
for scanner.Scan() {
line := scanner.Text()
line = strings.TrimSpace(line)
if strings.HasPrefix(line, "INSTANCE_PREFIX:") {
// kube-up
// Match:
// INSTANCE_PREFIX: 'clustername'
// INSTANCE_PREFIX: "clustername"
// INSTANCE_PREFIX: clustername
line = strings.TrimPrefix(line, "INSTANCE_PREFIX:")
} else if strings.HasPrefix(line, "ClusterName:") {
// kops
// Match:
// ClusterName: 'clustername'
// ClusterName: "clustername"
// ClusterName: clustername
line = strings.TrimPrefix(line, "ClusterName:")
} else {
continue
}
line = strings.TrimSpace(line)
line = strings.Trim(line, "'\"")
if clusterName != "" && clusterName != line {
klog.Warningf("cannot uniquely determine cluster-name, found %q and %q", line, clusterName)
return ""
}
clusterName = line
}
if err := scanner.Err(); err != nil {
klog.Warningf("error scanning UserData: %v", err)
return ""
}
return clusterName
}
// DeleteAutoScalingGroupLaunchTemplate deletes
func DeleteAutoScalingGroupLaunchTemplate(cloud fi.Cloud, r *resources.Resource) error {
c, ok := cloud.(awsup.AWSCloud)