github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #48456 from cosmincojocar/fix_azure_cert_password 

Automatic merge from submit-queue

Use the azure certificate password when decoding the certificate

**What this PR does / why we need it**:
Use the correct password when decoding the azure client certificate.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #47286

cc @colemickens
pull/6/head
Kubernetes Submit Queue 2017-07-04 16:01:02 -07:00 committed by GitHub
parent 1ff6498195 afafb3f231
commit bd53fb6f66
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/azure/azure.go
View File

@ -159,7 +159,7 @@ func newServicePrincipalToken(az *Cloud) (*azure.ServicePrincipalToken, error) {
if err != nil {
return nil, fmt.Errorf("reading the client certificate from file %s: %v", az.AADClientCertPath, err)
}
certificate, privateKey, err := decodePkcs12(certData, az.AADClientSecret)
certificate, privateKey, err := decodePkcs12(certData, az.AADClientCertPassword)
if err != nil {
return nil, fmt.Errorf("decoding the client certificate: %v", err)
}