d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix the ImagePullSecret for ACI Provider

Browse Source
This commit is contained in:
robbiezhang
2018-01-26 02:05:22 +00:00
parent 3668b0d6b9
commit 4a8d43f736
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
providers/azure/aci.go
View File

@@ -367,27 +367,25 @@ func (p *ACIProvider) getImagePullSecrets(pod *v1.Pod) ([]aci.ImageRegistryCrede
// TODO: Check if secret type is v1.SecretTypeDockercfg and use DockerConfigKey instead of hardcoded value // TODO: Check if secret type is v1.SecretTypeDockercfg and use DockerConfigKey instead of hardcoded value
// TODO: Check if secret type is v1.SecretTypeDockerConfigJson and use DockerConfigJsonKey to determine if it's in json format // TODO: Check if secret type is v1.SecretTypeDockerConfigJson and use DockerConfigJsonKey to determine if it's in json format
// TODO: Return error if it's not one of these two types // TODO: Return error if it's not one of these two types
repoDataB64, ok := secret.Data[".dockercfg"] repoData, ok := secret.Data[".dockercfg"]
if !ok { if !ok {
return ips, fmt.Errorf("no dockercfg present in secret") return ips, fmt.Errorf("no dockercfg present in secret")
} }
repoData, err := base64.StdEncoding.DecodeString(string(repoDataB64))
if err != nil { var authConfigs map[string]AuthConfig
return ips, err err = json.Unmarshal(repoData, &authConfigs)
}
var ac AuthConfig
err = json.Unmarshal(repoData, &ac)
if err != nil { if err != nil {
return ips, err return ips, err
} }
for server, authConfig := range authConfigs {
ips = append(ips, aci.ImageRegistryCredential{ ips = append(ips, aci.ImageRegistryCredential{
Password: ac.Password, Password: authConfig.Password,
Server: ac.ServerAddress, Server: server,
Username: ac.Username, Username: authConfig.Username,
}) })
} }
}
return ips, nil return ips, nil
} }