mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-11-03 01:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly output multi-doc machine config in get mc

Browse Source 
For `get mc -o json|yaml` we pretend that `spec` field is string and not an actual yaml map. That way you
can see the full spec in unformatted view using `talosctl -n <node> get mc -o yaml` or formatted using
`talosctl -n <node> get mc -o yaml | yq .spec`.

`edit mc` command is unaffected.

Fixes #8687

Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
This commit is contained in:
Dmitriy Matrenichev 2024-07-05 17:41:25 +03:00
parent 31af6b3f8c
commit d9db360ab4
No known key found for this signature in database
GPG Key ID: 94B473337258BFD5
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/talosctl/cmd/talos/edit.go
View File

@ -58,8 +58,7 @@ func editFn(c *client.Client) func(context.Context, string, resource.Resource, e
return errors.New("only the machineconfig resource can be edited")
}
metadata := mc.Metadata()
id := metadata.ID()
id := mc.Metadata().ID()
body, err := yaml.Marshal(mc.Spec())
if err != nil {

6
cmd/talosctl/cmd/talos/output/json.go
View File

@ -13,6 +13,8 @@ import (
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
yaml "gopkg.in/yaml.v3"
"github.com/siderolabs/talos/pkg/machinery/resources/config"
)
// JSON outputs resources in JSON format.
@ -37,6 +39,10 @@ func (j *JSON) WriteHeader(definition *meta.ResourceDefinition, withEvents bool)
// prepareEncodableData prepares the data of a resource to be encoded as JSON and populates it with some extra information.
func (j *JSON) prepareEncodableData(node string, r resource.Resource, event state.EventType) (map[string]interface{}, error) {
if r.Metadata().Type() == config.MachineConfigType {
r = &mcYamlRepr{r}
}
out, err := resource.MarshalYAML(r)
if err != nil {
return nil, err

4
cmd/talosctl/cmd/talos/output/table.go
View File

@ -96,7 +96,7 @@ func (table *Table) WriteResource(node string, r resource.Resource, event state.
return nil
}
values = append([]string{label}, values...)
values = slices.Insert(values, 0, label)
}
yml, err := yaml.Marshal(r.Spec())
@ -121,7 +121,7 @@ func (table *Table) WriteResource(node string, r resource.Resource, event state.
values = append(values, value)
}
values = append([]string{node}, values...)
values = slices.Insert(values, 0, node)
_, err = fmt.Fprintln(&table.w, strings.Join(values, "\t"))

21
cmd/talosctl/cmd/talos/output/yaml.go
View File

@ -13,6 +13,8 @@ import (
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
yaml "gopkg.in/yaml.v3"
"github.com/siderolabs/talos/pkg/machinery/resources/config"
)
// YAML outputs resources in YAML format.
@ -38,6 +40,10 @@ func (y *YAML) WriteHeader(definition *meta.ResourceDefinition, withEvents bool)
// WriteResource implements output.Writer interface.
func (y *YAML) WriteResource(node string, r resource.Resource, event state.EventType) error {
if r.Metadata().Type() == config.MachineConfigType {
r = &mcYamlRepr{r}
}
out, err := resource.MarshalYAML(r)
if err != nil {
return err
@ -62,3 +68,18 @@ func (y *YAML) WriteResource(node string, r resource.Resource, event state.Event
func (y *YAML) Flush() error {
return nil
}
type mcYamlRepr struct{ resource.Resource }
func (m *mcYamlRepr) Spec() any { return &mcYamlSpec{res: m.Resource} }
type mcYamlSpec struct{ res resource.Resource }
func (m *mcYamlSpec) MarshalYAML() (any, error) {
out, err := yaml.Marshal(m.res.Spec())
if err != nil {
return nil, err
}
return string(out), err
}