Issue-702 Imrpovement of cloudProviderSettings flow
#705
Conversation
This file contains 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
testisnullus
reviewed
Feb 9, 2024
apis/clusters/v1beta1/structs.go
Outdated
Comment on lines
849
to
928
| func (c *CloudProviderOptions) FromInstAPI(instaModel *models.CloudProviderSettings) { | ||
| s := CloudProviderOpts{} | ||
| *c = append(*c, &s) | ||
|
|
||
| switch { | ||
| case len(instaModel.AWSSettings) > 0: | ||
| s.AWSSettings = &AWSSettings{ | ||
| EncryptionKey: instaModel.AWSSettings[0].EBSEncryptionKey, | ||
| CustomVirtualNetworkID: instaModel.AWSSettings[0].CustomVirtualNetworkID, | ||
| BackupBucket: instaModel.AWSSettings[0].BackupBucket, | ||
| } | ||
| case len(instaModel.GCPSettings) > 0: | ||
| s.GCPSettings = &GCPSettings{ | ||
| CustomVirtualNetworkID: instaModel.GCPSettings[0].CustomVirtualNetworkID, | ||
| DisableSnapshotAutoExpiry: instaModel.GCPSettings[0].DisableSnapshotAutoExpiry, | ||
| } | ||
| case len(instaModel.AzureSettings) > 0: | ||
| s.AzureSettings = &AzureSettings{ | ||
| ResourceGroup: instaModel.AzureSettings[0].ResourceGroup, | ||
| CustomVirtualNetworkID: instaModel.AzureSettings[0].CustomVirtualNetworkID, | ||
| StorageNetwork: instaModel.AzureSettings[0].StorageNetwork, | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Here we will append only if s is not nil:
func (c *CloudProviderOptions) FromInstAPI(instaModel *models.CloudProviderSettings) {
var s *CloudProviderOpts
switch {
case len(instaModel.AWSSettings) > 0:
s = &CloudProviderOpts{
AWSSettings: &AWSSettings{
EncryptionKey: instaModel.AWSSettings[0].EBSEncryptionKey,
CustomVirtualNetworkID: instaModel.AWSSettings[0].CustomVirtualNetworkID,
BackupBucket: instaModel.AWSSettings[0].BackupBucket,
},
}
case len(instaModel.GCPSettings) > 0:
s = &CloudProviderOpts{
GCPSettings: &GCPSettings{
CustomVirtualNetworkID: instaModel.GCPSettings[0].CustomVirtualNetworkID,
DisableSnapshotAutoExpiry: instaModel.GCPSettings[0].DisableSnapshotAutoExpiry,
},
}
case len(instaModel.AzureSettings) > 0:
s = &CloudProviderOpts{
AzureSettings: &AzureSettings{
ResourceGroup: instaModel.AzureSettings[0].ResourceGroup,
CustomVirtualNetworkID: instaModel.AzureSettings[0].CustomVirtualNetworkID,
StorageNetwork: instaModel.AzureSettings[0].StorageNetwork,
},
}
if s != nil {
*c = append(*c, s)
}
}
}
wdyt?
There was a problem hiding this comment.
It makes sense. Done.
worryg0d
added
enhancement
worryg0d
force-pushed
the
issue-702
branch
6 times, most recently
from
6be9ce3 to
026a348
Compare
ribaraka
requested changes
Feb 12, 2024
| Region string `json:"region"` | ||
| // A logical name for the data centre within a cluster. | ||
| // These names must be unique in the cluster. | ||
| Name string `json:"name,omitempty"` |
Makefile
Outdated
| kubectl apply -f ~/creds_secret.yaml | ||
| $(KUSTOMIZE) build config/default | kubectl apply -f - |
There was a problem hiding this comment.
pls comment kustomization
Comment on lines
119
to
120
| Network string `json:"network"` | ||
| Tags map[string]string `json:"tags,omitempty"` |
| switch { | ||
| case len(instaModel.AWSSettings) > 0: | ||
| setting := instaModel.AWSSettings[0] | ||
| s.AWSSettings = append(s.AWSSettings, &AWSSettings{ |
apis/clusters/v1beta1/validation.go
Outdated
| return nil | ||
| } | ||
|
|
||
| func (s *GenericDataCentreSpec) cloudProviderSettingsPresented() bool { |
There was a problem hiding this comment.
hasCloudProviderSettings()
apis/clusters/v1beta1/validation.go
Outdated
Comment on lines
447
to
459
| fieldSet := 0 | ||
|
|
||
| if s.AWSSettings != nil { | ||
| fieldSet++ | ||
| } | ||
| if s.AzureSettings != nil { | ||
| fieldSet++ | ||
| } | ||
| if s.GCPSettings != nil { | ||
| fieldSet++ | ||
| } | ||
|
|
||
| if fieldSet > 1 { | ||
| return errors.New("only one of [awsSettings, gcpSettings, azureSettings] should be set") | ||
| } |
There was a problem hiding this comment.
if sum := len(s.AWSSettings) + len(s.AzureSettings) + len(s.GCPSettings); sum > 1 { return err }
ribaraka
approved these changes
Feb 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The PR provides devideds the whole
cloudProviderSettingsinto different object for each cloud provider.Closes #702