diff --git a/.gitignore b/.gitignore index f2ca3d6b5d..2e24dcac56 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ init.yaml controlplane.yaml join.yaml worker.yaml +machineconfig.yaml talosconfig /kubeconfig hack/test/libvirt/matchbox/assets/* diff --git a/go.mod b/go.mod index 727c3dfc84..d97b6cd5d4 100644 --- a/go.mod +++ b/go.mod @@ -148,7 +148,7 @@ require ( github.com/siderolabs/go-debug v0.6.1 github.com/siderolabs/go-kmsg v0.1.4 github.com/siderolabs/go-kubeconfig v0.1.1 - github.com/siderolabs/go-kubernetes v0.2.30 + github.com/siderolabs/go-kubernetes v0.2.31 github.com/siderolabs/go-loadbalancer v0.5.0 github.com/siderolabs/go-pcidb v0.3.2 github.com/siderolabs/go-pointer v1.0.1 diff --git a/go.sum b/go.sum index 918145b8c3..9c67cd3a25 100644 --- a/go.sum +++ b/go.sum @@ -659,8 +659,8 @@ github.com/siderolabs/go-kmsg v0.1.4 h1:RLAa90O9bWuhA3pXPAYAdrI+kzcqTshZASRA5yso github.com/siderolabs/go-kmsg v0.1.4/go.mod h1:BLkt2N2DHT0wsFMz32lMw6vNEZL90c8ZnBjpIUoBb/M= github.com/siderolabs/go-kubeconfig v0.1.1 h1:tZlgpelj/OqrcHVUwISPN0NRgObcflpH9WtE41mtQZ0= github.com/siderolabs/go-kubeconfig v0.1.1/go.mod h1:QaGp4i9L95oDbcU7jDn30aw4gnREkb3O5otgxw8imOk= -github.com/siderolabs/go-kubernetes v0.2.30 h1:sqOulDpkdTRtqTIn7odFAe5tz8ea12kZgNz0BOnxUb0= -github.com/siderolabs/go-kubernetes v0.2.30/go.mod h1:D6b6O6oVFXPUBTN+euLTF3llSw5GmUqP749brODKF5s= +github.com/siderolabs/go-kubernetes v0.2.31 h1:pAYVti2SUnUzXlGAMmZZPqhq2+V8ifg7zhFku4iqeTQ= +github.com/siderolabs/go-kubernetes v0.2.31/go.mod h1:D6b6O6oVFXPUBTN+euLTF3llSw5GmUqP749brODKF5s= github.com/siderolabs/go-loadbalancer v0.5.0 h1:0v7E6GrxoONyqwcmHiA+J0vIDPWbkTmevHGCFb4tjdc= github.com/siderolabs/go-loadbalancer v0.5.0/go.mod h1:tRVouZ9i2R/TRbNUF9MqyBlV2wsjX0cxkYTjPXcI9P0= github.com/siderolabs/go-pcidb v0.3.2 h1:18KMjsc+AO2r6/pl0KLBR9xOXO0ULLCXwmGhIukoAbw= diff --git a/pkg/cluster/kubernetes/talos_managed.go b/pkg/cluster/kubernetes/talos_managed.go index de20689b1a..c040913c96 100644 --- a/pkg/cluster/kubernetes/talos_managed.go +++ b/pkg/cluster/kubernetes/talos_managed.go @@ -508,48 +508,23 @@ func syncManifestsSSA(ctx context.Context, objects []*unstructured.Unstructured, return err } - ssaOptions := manifests.SSAOptions{ - FieldManagerName: constants.KubernetesFieldManagerName, - InventoryNamespace: constants.KubernetesInventoryNamespace, - InventoryName: constants.KubernetesBootstrapManifestsInventoryName, - SSApplyBehaviorOptions: manifests.SSApplyBehaviorOptions{ - DryRun: options.DryRun, - InventoryPolicy: options.InventoryPolicy, - ReconcileTimeout: options.ReconcileTimeout, - PruneTimeout: options.PruneTimeout, - ForceConflicts: options.ForceConflicts, - NoPrune: options.NoPrune, - }, - } - - options.Log("comparing with live objects") - - result, err := manifests.DiffSSA(ctx, objects, config, ssaOptions) - if err != nil { - return err - } - - if len(result) == 0 { - options.Log("< no changes detected") - } - - for _, r := range result { - objPath := fmt.Sprintf("%s %s/%s", r.Object.GroupVersionKind().Kind, r.Object.GetNamespace(), r.Object.GetName()) - if r.Object.GetNamespace() == "" { - objPath = fmt.Sprintf("%s %s", r.Object.GroupVersionKind().Kind, r.Object.GetName()) - } - - options.Log("< %s %s", r.Action, objPath) - options.Log("%s", r.Diff) - } - - options.Log("applying manifests") - - return manifests.SyncWithLogSSA( + return manifests.SyncAndDiffWithLogSSA( ctx, objects, config, - ssaOptions, + manifests.SSAOptions{ + FieldManagerName: constants.KubernetesFieldManagerName, + InventoryNamespace: constants.KubernetesInventoryNamespace, + InventoryName: constants.KubernetesBootstrapManifestsInventoryName, + SSApplyBehaviorOptions: manifests.SSApplyBehaviorOptions{ + DryRun: options.DryRun, + InventoryPolicy: options.InventoryPolicy, + ReconcileTimeout: options.ReconcileTimeout, + PruneTimeout: options.PruneTimeout, + ForceConflicts: options.ForceConflicts, + NoPrune: options.NoPrune, + }, + }, options.Log, ) }