-
Notifications
You must be signed in to change notification settings - Fork 19
feat: add cloud config support in hub-net-controller-manager #205
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
868610c
add cloud config parser and update hub-net-controller-manager chart
jwtty 2543e2b
Apply suggestions from code review
jwtty 8e65f3b
fix comment
jwtty 515d9a5
update helm chart
jwtty 39c35fd
move cloudconfig change to fleet repo
jwtty fd69fd3
fix comment
jwtty 080e90f
comment out cloudconfig flag
jwtty File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
charts/hub-net-controller-manager/templates/azurecloudconfig.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: azure-cloud-config | ||
| namespace: {{ .Values.fleetSystemNamespace }} | ||
| type: Opaque | ||
| data: | ||
| azure.json: {{ .Values.config.azureCloudConfig | toJson | indent 4 | b64enc | quote }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| Copyright (c) Microsoft Corporation. | ||
| Licensed under the MIT license. | ||
| */ | ||
|
|
||
| // Package cloudconfig defines azure cloud provider configuration. | ||
| package cloudconfig | ||
jwtty marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "sigs.k8s.io/cloud-provider-azure/pkg/azclient" | ||
| "sigs.k8s.io/yaml" | ||
| ) | ||
|
|
||
| // CloudConfig defines the necessary configurations to access Azure resources. | ||
| type CloudConfig struct { | ||
| azclient.ARMClientConfig `json:",inline" mapstructure:",squash"` | ||
| azclient.AzureAuthConfig `json:",inline" mapstructure:",squash"` | ||
| // subscription ID | ||
| SubscriptionID string `json:"subscriptionID,omitempty" mapstructure:"subscriptionID,omitempty"` | ||
| // azure resource location | ||
| Location string `json:"location,omitempty" mapstructure:"location,omitempty"` | ||
| // default resource group where the azure resources are deployed | ||
| ResourceGroup string `json:"resourceGroup,omitempty" mapstructure:"resourceGroup,omitempty"` | ||
| } | ||
|
|
||
| // NewCloudConfigFromFile loads cloud config from a file given the file path. | ||
| func NewCloudConfigFromFile(filePath string) (*CloudConfig, error) { | ||
| if filePath == "" { | ||
| return nil, fmt.Errorf("failed to load cloud config: file path is empty") | ||
| } | ||
|
|
||
| var config CloudConfig | ||
| configReader, err := os.Open(filePath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to open cloud config file: %w, file path: %s", err, filePath) | ||
| } | ||
| defer configReader.Close() | ||
|
|
||
| contents, err := io.ReadAll(configReader) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to read cloud config file: %w, file path: %s", err, filePath) | ||
| } | ||
|
|
||
| if err := yaml.Unmarshal(contents, &config); err != nil { | ||
| return nil, fmt.Errorf("failed to unmarshal cloud config: %w, file path: %s", err, filePath) | ||
| } | ||
|
|
||
| config.trimSpace() | ||
| if err := config.validate(); err != nil { | ||
| return nil, fmt.Errorf("failed to validate cloud config: %w, file contents: `%s`", err, string(contents)) | ||
| } | ||
|
|
||
| return &config, nil | ||
| } | ||
|
|
||
| // SetUserAgent sets the user agent string to access Azure resources. | ||
| func (cfg *CloudConfig) SetUserAgent(userAgent string) { | ||
| cfg.UserAgent = userAgent | ||
| } | ||
|
|
||
| func (cfg *CloudConfig) validate() error { | ||
| if cfg.Cloud == "" { | ||
| return fmt.Errorf("cloud is empty") | ||
| } | ||
|
|
||
| if cfg.Location == "" { | ||
| return fmt.Errorf("location is empty") | ||
| } | ||
|
|
||
| if cfg.SubscriptionID == "" { | ||
| return fmt.Errorf("subscription ID is empty") | ||
| } | ||
|
|
||
| if cfg.ResourceGroup == "" { | ||
| return fmt.Errorf("resource group is empty") | ||
| } | ||
|
|
||
| if !cfg.UseManagedIdentityExtension { | ||
| if cfg.UserAssignedIdentityID != "" { | ||
| return fmt.Errorf("useManagedIdentityExtension needs to be true when userAssignedIdentityID is provided") | ||
| } | ||
| if cfg.AADClientID == "" || cfg.AADClientSecret == "" { | ||
| return fmt.Errorf("AAD client ID or AAD client secret is empty") | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (cfg *CloudConfig) trimSpace() { | ||
| cfg.Cloud = strings.TrimSpace(cfg.Cloud) | ||
| cfg.TenantID = strings.TrimSpace(cfg.TenantID) | ||
| cfg.UserAgent = strings.TrimSpace(cfg.UserAgent) | ||
| cfg.SubscriptionID = strings.TrimSpace(cfg.SubscriptionID) | ||
| cfg.Location = strings.TrimSpace(cfg.Location) | ||
| cfg.ResourceGroup = strings.TrimSpace(cfg.ResourceGroup) | ||
| cfg.UserAssignedIdentityID = strings.TrimSpace(cfg.UserAssignedIdentityID) | ||
| cfg.AADClientID = strings.TrimSpace(cfg.AADClientID) | ||
| cfg.AADClientSecret = strings.TrimSpace(cfg.AADClientSecret) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.