Skip to content

K
k3s
Commit bd53fb6f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 1ff64981 afafb3f2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/cloudprovider/providers/azure/azure.go
View file @ bd53fb6f
...@@ -159,7 +159,7 @@ func newServicePrincipalToken(az *Cloud) (*azure.ServicePrincipalToken, error) { ...@@ -159,7 +159,7 @@ func newServicePrincipalToken(az *Cloud) (*azure.ServicePrincipalToken, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("reading the client certificate from file %s: %v", az.AADClientCertPath, err) 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 { if err != nil {
return nil, fmt.Errorf("decoding the client certificate: %v", err) return nil, fmt.Errorf("decoding the client certificate: %v", err)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment