github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

misc fixes

Browse Source
This commit is contained in:
jadarsie 2019-11-21 10:18:34 -08:00
parent ec57d8a4d0
commit 55828d059d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/credentialprovider/azure/azure_credentials.go
View File

@ -144,7 +144,7 @@ func (a *acrProvider) loadConfig(rdr io.Reader) error {
klog.Errorf("Failed to load azure credential file: %v", err) klog.Errorf("Failed to load azure credential file: %v", err)
} }
a.environment, err = auth.ParseAzureEnvironment(a.config.Cloud, a.config.cloudFQDN, a.config.IdentitySystem) a.environment, err = auth.ParseAzureEnvironment(a.config.Cloud, a.config.CloudFQDN, a.config.IdentitySystem)
if err != nil { if err != nil {
return err return err
} }

11
staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth.go
View File

@ -64,10 +64,10 @@ type AzureAuthConfig struct {
SubscriptionID string `json:"subscriptionId,omitempty" yaml:"subscriptionId,omitempty"` SubscriptionID string `json:"subscriptionId,omitempty" yaml:"subscriptionId,omitempty"`
// IdentitySystem indicates the identity provider. Relevant only to hybrid clouds (Azure Stack). // IdentitySystem indicates the identity provider. Relevant only to hybrid clouds (Azure Stack).
// Allowed values are 'azure_ad' (default), 'adfs'. // Allowed values are 'azure_ad' (default), 'adfs'.
IdentitySystem string `json:"identitySystem" yaml:"identitySystem"` IdentitySystem string `json:"identitySystem,omitempty" yaml:"identitySystem,omitempty"`
// CloudFQDN represents the hybrid cloud's fully qualified domain name: {location}.{domain} // CloudFQDN represents the hybrid cloud's fully qualified domain name: {location}.{domain}
// If set, cloud provider will generate its autorest.Environment instead of using one of the pre-defined ones. // If set, cloud provider will generate its autorest.Environment instead of using one of the pre-defined ones.
CloudFQDN string `json:"cloudFQDN" yaml:"cloudFQDN"` CloudFQDN string `json:"cloudFQDN,omitempty" yaml:"cloudFQDN,omitempty"`
} }
// GetServicePrincipalToken creates a new service principal token based on the configuration // GetServicePrincipalToken creates a new service principal token based on the configuration
@ -142,11 +142,13 @@ func ParseAzureEnvironment(cloudName, cloudFQDN, identitySystem string) (*azure.
klog.V(4).Infof("Loading environment from resource manager endpoint: %s", resourceManagerEndpoint) klog.V(4).Infof("Loading environment from resource manager endpoint: %s", resourceManagerEndpoint)
env, err = azure.EnvironmentFromURL(resourceManagerEndpoint, nameOverride) env, err = azure.EnvironmentFromURL(resourceManagerEndpoint, nameOverride)
if err == nil && strings.EqualFold(cloudName, "AzureStackCloud") { if err == nil && strings.EqualFold(cloudName, "AzureStackCloud") {
azureStackOverrides(env, cloudFQDN, identitySystem) azureStackOverrides(&env, cloudFQDN, identitySystem)
} }
} else if cloudName == "" { } else if cloudName == "" {
klog.V(4).Info("Using public cloud environment")
env = azure.PublicCloud env = azure.PublicCloud
} else { } else {
klog.V(4).Infof("Using %s environment", cloudName)
env, err = azure.EnvironmentFromName(cloudName) env, err = azure.EnvironmentFromName(cloudName)
} }
return &env, err return &env, err
@ -167,7 +169,7 @@ func decodePkcs12(pkcs []byte, password string) (*x509.Certificate, *rsa.Private
return certificate, rsaPrivateKey, nil return certificate, rsaPrivateKey, nil
} }
func azureStackOverrides(env azure.Environment, cloudFQDN, identitySystem string) azure.Environment { func azureStackOverrides(env *azure.Environment, cloudFQDN, identitySystem string) {
// if AzureStack, make sure the generated environment matches what AKSe currently generates // if AzureStack, make sure the generated environment matches what AKSe currently generates
env.ManagementPortalURL = fmt.Sprintf("https://portal.%s/", cloudFQDN) env.ManagementPortalURL = fmt.Sprintf("https://portal.%s/", cloudFQDN)
// TODO: figure out why AKSe does this // TODO: figure out why AKSe does this
@ -183,5 +185,4 @@ func azureStackOverrides(env azure.Environment, cloudFQDN, identitySystem string
env.ActiveDirectoryEndpoint = strings.TrimSuffix(env.ActiveDirectoryEndpoint, "/") env.ActiveDirectoryEndpoint = strings.TrimSuffix(env.ActiveDirectoryEndpoint, "/")
env.ActiveDirectoryEndpoint = strings.TrimSuffix(env.ActiveDirectoryEndpoint, "adfs") env.ActiveDirectoryEndpoint = strings.TrimSuffix(env.ActiveDirectoryEndpoint, "adfs")
} }
return env
} }