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

Merge pull request #16493 from hakman/azure_storage_account 

aliyun: Remove some leftovers
This commit is contained in:
Kubernetes Prow Robot 2024-04-26 08:53:29 -07:00 committed by GitHub
parent 79677138c8 f073917ef1
commit fd4fa6da44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nodeup/pkg/bootstrap/install.go
View File

@ -125,11 +125,6 @@ func (i *Installation) buildEnvFile() *nodetasks.InstallFile {
envVars["OSS_REGION"] = os.Getenv("OSS_REGION")
}
if os.Getenv("ALIYUN_ACCESS_KEY_ID") != "" {
envVars["ALIYUN_ACCESS_KEY_ID"] = os.Getenv("ALIYUN_ACCESS_KEY_ID")
envVars["ALIYUN_ACCESS_KEY_SECRET"] = os.Getenv("ALIYUN_ACCESS_KEY_SECRET")
}
if os.Getenv("AZURE_STORAGE_ACCOUNT") != "" {
envVars["AZURE_STORAGE_ACCOUNT"] = os.Getenv("AZURE_STORAGE_ACCOUNT")
}

5
nodeup/pkg/model/protokube.go
View File

@ -285,11 +285,6 @@ func (t *ProtokubeBuilder) buildEnvFile() (*nodetasks.File, error) {
envVars["OSS_REGION"] = os.Getenv("OSS_REGION")
}
if os.Getenv("ALIYUN_ACCESS_KEY_ID") != "" {
envVars["ALIYUN_ACCESS_KEY_ID"] = os.Getenv("ALIYUN_ACCESS_KEY_ID")
envVars["ALIYUN_ACCESS_KEY_SECRET"] = os.Getenv("ALIYUN_ACCESS_KEY_SECRET")
}
if os.Getenv("AZURE_STORAGE_ACCOUNT") != "" {
envVars["AZURE_STORAGE_ACCOUNT"] = os.Getenv("AZURE_STORAGE_ACCOUNT")
}

3
util/pkg/vfs/context.go
View File

@ -143,9 +143,6 @@ func (c *VFSContext) ReadFile(location string, options ...VFSOption) ([]byte, er
case "digitalocean":
httpURL := "http://169.254.169.254/metadata/v1" + u.Path
return c.readHTTPLocation(httpURL, nil, opts)
case "alicloud":
httpURL := "http://100.100.100.200/latest/meta-data/" + u.Path
return c.readHTTPLocation(httpURL, nil, opts)
case "openstack":
httpURL := "http://169.254.169.254/latest/meta-data/" + u.Path
return c.readHTTPLocation(httpURL, nil, opts)