Skip to content

Resolve replica number reversion issue #1916

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.

Sign up for GitHub

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
ibm-ci-bot merged 1 commit into from
Apr 10, 2024
Merged

Resolve replica number reversion issue #1916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions controllers/operandconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func mergeCSCRs(csSummary, csCR, ruleSlice []interface{}, serviceControllerMappi
}
newResource := getItemByGVKNameNamespace(summaryCR.(map[string]interface{})["resources"].([]interface{}), opconNs, apiVersion, kind, name, namespace)
if newResource != nil {
operator.(map[string]interface{})["resources"].([]interface{})[i] = mergeCRsIntoOperandConfigWithDefaultRules(opResource.(map[string]interface{}), newResource.(map[string]interface{}), true)
operator.(map[string]interface{})["resources"].([]interface{})[i] = mergeCRsIntoOperandConfigWithDefaultRules(opResource.(map[string]interface{}), newResource.(map[string]interface{}), false)
}
}
csSummary = setResByName(csSummary, operator.(map[string]interface{})["name"].(string), operator.(map[string]interface{})["resources"].([]interface{}))
Expand All @@ -175,7 +175,6 @@ func mergeCSCRs(csSummary, csCR, ruleSlice []interface{}, serviceControllerMappi

// mergeCRsIntoOperandConfig merges CRs by specific rules
func mergeCRsIntoOperandConfigWithDefaultRules(defaultMap map[string]interface{}, changedMap map[string]interface{}, directAssign bool) map[string]interface{} {
// TODO: Apply default rules
for key := range defaultMap {
if reflect.DeepEqual(defaultMap[key], changedMap[key]) {
continue
Expand Down Expand Up @@ -233,12 +232,13 @@ func mergeChangedMap(key string, defaultMap interface{}, changedMap interface{},
changedMapRef := changedMap.([]interface{})
for i := range defaultMapRef {
if _, ok := defaultMapRef[i].(map[string]interface{}); ok {
for newKey := range defaultMapRef[i].(map[string]interface{}) {
// check if the changedMapRef[i] is nil
if changedMapRef[i] == nil {
changedMapRef[i] = map[string]interface{}{}
if len(changedMapRef) <= i {
finalMap[key] = append(finalMap[key].([]interface{}), defaultMapRef[i])
} else {

for newKey := range defaultMapRef[i].(map[string]interface{}) {
mergeChangedMap(newKey, defaultMapRef[i].(map[string]interface{})[newKey], changedMapRef[i].(map[string]interface{})[newKey], finalMap[key].([]interface{})[i].(map[string]interface{}), directAssign)
}
mergeChangedMap(newKey, defaultMapRef[i].(map[string]interface{})[newKey], changedMapRef[i].(map[string]interface{})[newKey], finalMap[key].([]interface{})[i].(map[string]interface{}), directAssign)
}
}
}
Expand Down Expand Up @@ -342,12 +342,13 @@ func deepMergeTwoMaps(key string, defaultMap interface{}, changedMap interface{}
changedMapRef := changedMap.([]interface{})
for i := range defaultMapRef {
if _, ok := defaultMapRef[i].(map[string]interface{}); ok {
for newKey := range defaultMapRef[i].(map[string]interface{}) {
// check if the changedMapRef[i] is nil
if changedMapRef[i] == nil {
changedMapRef[i] = map[string]interface{}{}
if len(changedMapRef) <= i {
finalMap[key] = append(finalMap[key].([]interface{}), defaultMapRef[i])
} else {

for newKey := range defaultMapRef[i].(map[string]interface{}) {
deepMergeTwoMaps(newKey, defaultMapRef[i].(map[string]interface{})[newKey], changedMapRef[i].(map[string]interface{})[newKey], finalMap[key].([]interface{})[i].(map[string]interface{}))
}
deepMergeTwoMaps(newKey, defaultMapRef[i].(map[string]interface{})[newKey], changedMapRef[i].(map[string]interface{})[newKey], finalMap[key].([]interface{})[i].(map[string]interface{}))
}
}
}
Expand Down