feat(): layer2 support for CAPP #787
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,4 @@ spec: | |
| spec: | ||
| containers: | ||
| - name: manager | ||
| imagePullPolicy: Always | ||
|
|
||
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| package layer2 | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
||
| const ( | ||
| cloudConfigHeader = "#cloud-config" | ||
| jinjaHeader = "## template: jinja" | ||
| ) | ||
|
|
||
| // CloudConfigMerger handles the merging of cloud configs | ||
| type CloudConfigMerger struct { | ||
| } | ||
|
|
||
| // NewCloudConfigMerger creates a new instance of CloudConfigMerger | ||
| func NewCloudConfigMerger() *CloudConfigMerger { | ||
| return &CloudConfigMerger{} | ||
| } | ||
|
|
||
| // configHeaders represents the headers found in a cloud-config file | ||
| type configHeaders struct { | ||
| hasJinja bool | ||
| hasCloudConfig bool | ||
| } | ||
|
|
||
| // stripHeaders removes the template and cloud-config headers and returns the remaining content | ||
| func stripHeaders(data string) (string, configHeaders) { | ||
| headers := configHeaders{} | ||
| lines := strings.Split(strings.TrimSpace(data), "\n") | ||
| startIndex := 0 | ||
|
|
||
| for i, line := range lines { | ||
| trimmedLine := strings.TrimSpace(line) | ||
| switch trimmedLine { | ||
|
There was a problem hiding this comment. this assumes there will not be any other header ! Can we modify this to be more generic - is there a way to identify headers apart from string equals |
||
| case jinjaHeader: | ||
| headers.hasJinja = true | ||
| startIndex = i + 1 | ||
| case cloudConfigHeader: | ||
| headers.hasCloudConfig = true | ||
| startIndex = i + 1 | ||
| default: | ||
| if trimmedLine != "" && !strings.HasPrefix(trimmedLine, "#") { | ||
| return strings.Join(lines[startIndex:], "\n"), headers | ||
| } | ||
| } | ||
| } | ||
| return "", headers | ||
| } | ||
|
|
||
| // deepMerge recursively merges two maps | ||
| func (m *CloudConfigMerger) deepMerge(base, overlay map[string]interface{}) map[string]interface{} { | ||
| result := make(map[string]interface{}) | ||
|
|
||
| // Copy base map | ||
| for k, v := range base { | ||
| result[k] = v | ||
| } | ||
|
|
||
| // Merge overlay | ||
| for k, v := range overlay { | ||
| if baseVal, exists := result[k]; exists { | ||
| // If both values are maps, merge them recursively | ||
| if baseMap, ok := baseVal.(map[string]interface{}); ok { | ||
| if overlayMap, ok := v.(map[string]interface{}); ok { | ||
| result[k] = m.deepMerge(baseMap, overlayMap) | ||
| continue | ||
| } | ||
| } | ||
|
|
||
| // If both values are slices, append them | ||
| if baseSlice, ok := baseVal.([]interface{}); ok { | ||
| if overlaySlice, ok := v.([]interface{}); ok { | ||
| result[k] = append(baseSlice, overlaySlice...) | ||
| continue | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // For all other cases, overlay value takes precedence | ||
| result[k] = v | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| // buildHeader constructs the appropriate header based on the input configurations | ||
| func buildHeader(bootstrapHeaders, layer2Headers configHeaders) string { | ||
| var headers []string | ||
|
|
||
| // If either input has the Jinja header, include it in the output | ||
| if bootstrapHeaders.hasJinja || layer2Headers.hasJinja { | ||
| headers = append(headers, jinjaHeader) | ||
| } | ||
|
|
||
| // Always include the cloud-config header | ||
| headers = append(headers, cloudConfigHeader) | ||
|
|
||
| return strings.Join(headers, "\n") | ||
| } | ||
|
|
||
| // MergeConfigs combines bootstrap data with layer2 config | ||
| func (m *CloudConfigMerger) MergeConfigs(bootstrapData string, layer2UserData string) (string, error) { | ||
|
There was a problem hiding this comment. can we make this generic as well ? CloudConfigMerger.WithBootstrapData(bdata).
WithLayer2Data(l2data).
WithAddlUserDatas([]userdatas). // this can be optional and can be extensible
MergeConfigs() |
||
| // Strip headers and get header info | ||
| bootstrapStripped, bootstrapHeaders := stripHeaders(bootstrapData) | ||
| layer2Stripped, layer2Headers := stripHeaders(layer2UserData) | ||
|
|
||
| // Validate that at least one input has the cloud-config header | ||
| if !bootstrapHeaders.hasCloudConfig && !layer2Headers.hasCloudConfig { | ||
| return "", fmt.Errorf("neither input contains #cloud-config header") | ||
| } | ||
|
|
||
| var bootstrapConfig, layer2UserDataConfig map[string]interface{} | ||
|
|
||
| if bootstrapStripped != "" { | ||
| if err := yaml.Unmarshal([]byte(bootstrapStripped), &bootstrapConfig); err != nil { | ||
| return "", fmt.Errorf("error parsing bootstrap YAML: %v", err) | ||
| } | ||
| } else { | ||
| bootstrapConfig = make(map[string]interface{}) | ||
| } | ||
|
|
||
| if layer2Stripped != "" { | ||
| if err := yaml.Unmarshal([]byte(layer2Stripped), &layer2UserDataConfig); err != nil { | ||
| return "", fmt.Errorf("error parsing layer2 YAML: %v", err) | ||
| } | ||
| } else { | ||
| layer2UserDataConfig = make(map[string]interface{}) | ||
| } | ||
|
Comment on lines
+124
to
+138
There was a problem hiding this comment. bootstrapConfig := make(map[string]interface{})
if err := yaml.Unmarshal([]byte(layer2Stripped), &layer2UserDataConfig); err != nil {
return "", fmt.Errorf("error parsing layer2 YAML: %v", err)
}
layer2UserDataConfig := make(map[string]interface{})
if err := yaml.Unmarshal([]byte(layer2Stripped), &layer2UserDataConfig); err != nil {
return "", fmt.Errorf("error parsing layer2 YAML: %v", err)
} |
||
|
|
||
| // Merge configurations | ||
| mergedConfig := m.deepMerge(layer2UserDataConfig, bootstrapConfig) | ||
|
|
||
| // Convert merged config back to YAML | ||
| result, err := yaml.Marshal(mergedConfig) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error marshaling merged config: %v", err) | ||
| } | ||
|
|
||
| // Build appropriate headers and combine with content | ||
| header := buildHeader(bootstrapHeaders, layer2Headers) | ||
| return fmt.Sprintf("%s\n%s", header, string(result)), nil | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
keep this for your local testing only