Merge pull request #4513 from Affan-7/lint-redefined-builtin-id
Add linting for redefined builtin ids
This commit is contained in:
commit
560e2cbe11
|
@ -84,6 +84,7 @@ linters-settings:
|
||||||
- name: indent-error-flow
|
- name: indent-error-flow
|
||||||
- name: unreachable-code
|
- name: unreachable-code
|
||||||
- name: var-naming
|
- name: var-naming
|
||||||
|
- name: redefines-builtin-id
|
||||||
staticcheck:
|
staticcheck:
|
||||||
checks:
|
checks:
|
||||||
- all
|
- all
|
||||||
|
|
|
@ -72,28 +72,28 @@ func ConvertToClusterNames(clusters []workv1alpha2.TargetCluster) sets.Set[strin
|
||||||
}
|
}
|
||||||
|
|
||||||
// MergeTargetClusters will merge the replicas in two TargetCluster
|
// MergeTargetClusters will merge the replicas in two TargetCluster
|
||||||
func MergeTargetClusters(old, new []workv1alpha2.TargetCluster) []workv1alpha2.TargetCluster {
|
func MergeTargetClusters(oldCluster, newCluster []workv1alpha2.TargetCluster) []workv1alpha2.TargetCluster {
|
||||||
switch {
|
switch {
|
||||||
case len(old) == 0:
|
case len(oldCluster) == 0:
|
||||||
return new
|
return newCluster
|
||||||
case len(new) == 0:
|
case len(newCluster) == 0:
|
||||||
return old
|
return oldCluster
|
||||||
}
|
}
|
||||||
// oldMap is a map of the result for the old replicas so that it can be merged with the new result easily
|
// oldMap is a map of the result for the old replicas so that it can be merged with the new result easily
|
||||||
oldMap := make(map[string]int32)
|
oldMap := make(map[string]int32)
|
||||||
for _, cluster := range old {
|
for _, cluster := range oldCluster {
|
||||||
oldMap[cluster.Name] = cluster.Replicas
|
oldMap[cluster.Name] = cluster.Replicas
|
||||||
}
|
}
|
||||||
// merge the new replicas and the data of old replicas
|
// merge the new replicas and the data of old replicas
|
||||||
for i, cluster := range new {
|
for i, cluster := range newCluster {
|
||||||
value, ok := oldMap[cluster.Name]
|
value, ok := oldMap[cluster.Name]
|
||||||
if ok {
|
if ok {
|
||||||
new[i].Replicas = cluster.Replicas + value
|
newCluster[i].Replicas = cluster.Replicas + value
|
||||||
delete(oldMap, cluster.Name)
|
delete(oldMap, cluster.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for key, value := range oldMap {
|
for key, value := range oldMap {
|
||||||
new = append(new, workv1alpha2.TargetCluster{Name: key, Replicas: value})
|
newCluster = append(newCluster, workv1alpha2.TargetCluster{Name: key, Replicas: value})
|
||||||
}
|
}
|
||||||
return new
|
return newCluster
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue