mirrors/omni
1
0
Fork 0
mirror of https://github.com/siderolabs/omni.git synced 2026-05-05 06:36:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace append with slices pkg functions

Browse Source 
Use slices.Insert and slices.Concat where it's proper.

Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
This commit is contained in:
Dmitriy Matrenichev 2024-06-21 00:26:39 +03:00
parent ccc9d22bf5
commit 92afd423ec
No known key found for this signature in database
GPG Key ID: 94B473337258BFD5
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/pkg/template/internal/models/list.go
View File

@ -98,7 +98,7 @@ func (l List) Validate() error {
multiErr = multierror.Append(multiErr, fmt.Errorf("machines %v are used in both controlplane and workers", intersection))
}
allMachines := append(slices.Clone(controlPlaneMachines), workerMachines...)
allMachines := slices.Concat(controlPlaneMachines, workerMachines)
allMachinesSet := xslices.ToSet(allMachines)
for _, model := range l {

4
client/pkg/template/operations/delete.go
View File

@ -8,6 +8,7 @@ import (
"context"
"fmt"
"io"
"slices"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/state"
@ -83,8 +84,7 @@ func deleteTemplate(ctx context.Context, tmpl *template.Template, out io.Writer,
return err
}
syncResult.Destroy = append([][]resource.Resource{extensionsConfigurations.Items}, append([][]resource.Resource{links},
append([][]resource.Resource{allPatches}, syncResult.Destroy...)...)...)
syncResult.Destroy = slices.Insert(syncResult.Destroy, 0, extensionsConfigurations.Items, links, allPatches)
}
return syncDelete(ctx, syncResult, out, st, syncOptions)

29
internal/backend/runtime/omni/omni.go
View File

@ -9,6 +9,7 @@ package omni
import (
"context"
"fmt"
"slices"
"time"
"github.com/cosi-project/runtime/pkg/controller"
@ -273,19 +274,21 @@ func New(talosClientFactory *talos.ClientFactory, dnsService *dns.Service, workl
metricsRegistry.MustRegister(expvarCollector)
validationOptions := clusterValidationOptions(resourceState, config.Config.EtcdBackup, config.Config.EmbeddedDiscoveryService)
validationOptions = append(validationOptions, relationLabelsValidationOptions()...)
validationOptions = append(validationOptions, accessPolicyValidationOptions()...)
validationOptions = append(validationOptions, aclValidationOptions(resourceState)...)
validationOptions = append(validationOptions, roleValidationOptions()...)
validationOptions = append(validationOptions, machineSetNodeValidationOptions(resourceState)...)
validationOptions = append(validationOptions, machineSetValidationOptions(resourceState, storeFactory)...)
validationOptions = append(validationOptions, identityValidationOptions(config.Config.Auth.SAML)...)
validationOptions = append(validationOptions, exposedServiceValidationOptions()...)
validationOptions = append(validationOptions, configPatchValidationOptions(resourceState)...)
validationOptions = append(validationOptions, etcdManualBackupValidationOptions()...)
validationOptions = append(validationOptions, samlLabelRuleValidationOptions()...)
validationOptions = append(validationOptions, s3ConfigValidationOptions()...)
validationOptions := slices.Concat(
clusterValidationOptions(resourceState, config.Config.EtcdBackup, config.Config.EmbeddedDiscoveryService),
relationLabelsValidationOptions(),
accessPolicyValidationOptions(),
aclValidationOptions(resourceState),
roleValidationOptions(),
machineSetNodeValidationOptions(resourceState),
machineSetValidationOptions(resourceState, storeFactory),
identityValidationOptions(config.Config.Auth.SAML),
exposedServiceValidationOptions(),
configPatchValidationOptions(resourceState),
etcdManualBackupValidationOptions(),
samlLabelRuleValidationOptions(),
s3ConfigValidationOptions(),
)
return &Runtime{
controllerRuntime: controllerRuntime,