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

generalize solution

Browse Source
This commit is contained in:
jadarsie 2019-11-21 19:14:47 -08:00
parent 11b0e9af25
commit 3322ff9551
3 changed files with 18 additions and 22 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.ResourceManagerEndpoint, a.config.IdentitySystem)
if err != nil { if err != nil {
return err return err
} }

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

@ -65,9 +65,9 @@ type AzureAuthConfig struct {
// 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,omitempty" yaml:"identitySystem,omitempty"` IdentitySystem string `json:"identitySystem,omitempty" yaml:"identitySystem,omitempty"`
// CloudFQDN represents the hybrid cloud's fully qualified domain name: {location}.{domain} // ResourceManagerEndpoint is the cloud's resource manager endpoint. If set, cloud provider queries this endpoint
// If set, cloud provider will generate its autorest.Environment instead of using one of the pre-defined ones. // in order to generate an autorest.Environment instance instead of using one of the pre-defined Environments.
CloudFQDN string `json:"cloudFQDN,omitempty" yaml:"cloudFQDN,omitempty"` ResourceManagerEndpoint string `json:"resourceManagerEndpoint,omitempty" yaml:"resourceManagerEndpoint,omitempty"`
} }
// GetServicePrincipalToken creates a new service principal token based on the configuration // GetServicePrincipalToken creates a new service principal token based on the configuration
@ -133,18 +133,17 @@ func GetServicePrincipalToken(config *AzureAuthConfig, env *azure.Environment) (
} }
// ParseAzureEnvironment returns the azure environment. // ParseAzureEnvironment returns the azure environment.
// If 'cloudFQDN' is set, environment is computed by quering the cloud's resource manager endpoint. // If 'resourceManagerEndpoint' is set, the environment is computed by quering the cloud's resource manager endpoint.
// Otherwise, a pre-defined Environment is looked up by name. // Otherwise, a pre-defined Environment is looked up by name.
func ParseAzureEnvironment(cloudName, cloudFQDN, identitySystem string) (*azure.Environment, error) { func ParseAzureEnvironment(cloudName, resourceManagerEndpoint, identitySystem string) (*azure.Environment, error) {
var env azure.Environment var env azure.Environment
var err error var err error
if cloudFQDN != "" { if resourceManagerEndpoint != "" {
resourceManagerEndpoint := fmt.Sprintf("https://management.%s/", cloudFQDN)
nameOverride := azure.OverrideProperty{Key: azure.EnvironmentName, Value: cloudName}
klog.V(4).Infof("Loading environment from resource manager endpoint: %s", resourceManagerEndpoint) klog.V(4).Infof("Loading environment from resource manager endpoint: %s", resourceManagerEndpoint)
nameOverride := azure.OverrideProperty{Key: azure.EnvironmentName, Value: cloudName}
env, err = azure.EnvironmentFromURL(resourceManagerEndpoint, nameOverride) env, err = azure.EnvironmentFromURL(resourceManagerEndpoint, nameOverride)
if err == nil && strings.EqualFold(cloudName, "AzureStackCloud") { if err == nil {
azureStackOverrides(&env, cloudFQDN, identitySystem) azureStackOverrides(&env, resourceManagerEndpoint, identitySystem)
} }
} else if cloudName == "" { } else if cloudName == "" {
klog.V(4).Info("Using public cloud environment") klog.V(4).Info("Using public cloud environment")
@ -172,19 +171,16 @@ func decodePkcs12(pkcs []byte, password string) (*x509.Certificate, *rsa.Private
} }
// azureStackOverrides ensures that the Environment matches what AKSe currently generates for Azure Stack // azureStackOverrides ensures that the Environment matches what AKSe currently generates for Azure Stack
func azureStackOverrides(env *azure.Environment, cloudFQDN, identitySystem string) { func azureStackOverrides(env *azure.Environment, resourceManagerEndpoint, identitySystem string) {
env.ManagementPortalURL = fmt.Sprintf("https://portal.%s/", cloudFQDN) env.ManagementPortalURL = strings.Replace(resourceManagerEndpoint, "https://management.", "https://portal.", -1)
// TODO: figure out why AKSe does this // TODO: figure out why AKSe does this, why is autorest not setting ServiceManagementEndpoint?
// why is autorest not setting ServiceManagementEndpoint?
env.ServiceManagementEndpoint = env.TokenAudience env.ServiceManagementEndpoint = env.TokenAudience
// TODO: figure out why AKSe does this // TODO: figure out why AKSe does this, may not be required, ResourceManagerVMDNSSuffix is not referenced anywhere
// May not be required, ResourceManagerVMDNSSuffix is not used by k/k env.ResourceManagerVMDNSSuffix = strings.Replace(resourceManagerEndpoint, "https://management.", "cloudapp.", -1)
split := strings.Split(cloudFQDN, ".") env.ResourceManagerVMDNSSuffix = strings.TrimSuffix(env.ResourceManagerVMDNSSuffix, "/")
domain := strings.Join(split[1:], ".")
env.ResourceManagerVMDNSSuffix = fmt.Sprintf("cloudapp.%s", domain)
// NOTE: autorest sets KeyVaultEndpoint while AKSe does not
if strings.EqualFold(identitySystem, ADFSIdentitySystem) { if strings.EqualFold(identitySystem, ADFSIdentitySystem) {
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")
} }
// NOTE: autorest sets KeyVaultEndpoint while AKSe does not
} }

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure.go
View File

@ -325,7 +325,7 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro
} }
} }
env, err := auth.ParseAzureEnvironment(config.Cloud, config.CloudFQDN, config.IdentitySystem) env, err := auth.ParseAzureEnvironment(config.Cloud, config.ResourceManagerEndpoint, config.IdentitySystem)
if err != nil { if err != nil {
return err return err
} }