diff --git a/cmd/talosctl/cmd/talos/health.go b/cmd/talosctl/cmd/talos/health.go index 54bb4b6b8..a30ad2753 100644 --- a/cmd/talosctl/cmd/talos/health.go +++ b/cmd/talosctl/cmd/talos/health.go @@ -49,9 +49,9 @@ func (cluster *clusterNodes) NodesByType(t machine.Type) []string { return []string{cluster.InitNode} case machine.TypeControlPlane: - return cluster.ControlPlaneNodes + return append([]string(nil), cluster.ControlPlaneNodes...) case machine.TypeJoin: - return cluster.WorkerNodes + return append([]string(nil), cluster.WorkerNodes...) case machine.TypeUnknown: return nil default: diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_cluster.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_cluster.go index 23e6e3168..630bcffca 100644 --- a/internal/app/machined/internal/server/v1alpha1/v1alpha1_cluster.go +++ b/internal/app/machined/internal/server/v1alpha1/v1alpha1_cluster.go @@ -81,7 +81,7 @@ type clusterState struct { } func (cluster *clusterState) Nodes() []string { - return append(cluster.controlPlaneNodes, cluster.workerNodes...) + return append([]string(nil), append(cluster.controlPlaneNodes, cluster.workerNodes...)...) } func (cluster *clusterState) NodesByType(t machine.Type) []string { @@ -89,9 +89,9 @@ func (cluster *clusterState) NodesByType(t machine.Type) []string { case machine.TypeInit: return nil case machine.TypeControlPlane: - return cluster.controlPlaneNodes + return append([]string(nil), cluster.controlPlaneNodes...) case machine.TypeJoin: - return cluster.workerNodes + return append([]string(nil), cluster.workerNodes...) case machine.TypeUnknown: return nil default: diff --git a/internal/integration/base/cluster.go b/internal/integration/base/cluster.go index d04f944aa..c9c81b8d3 100644 --- a/internal/integration/base/cluster.go +++ b/internal/integration/base/cluster.go @@ -14,7 +14,7 @@ type infoWrapper struct { } func (wrapper *infoWrapper) Nodes() []string { - return append(wrapper.masterNodes, wrapper.workerNodes...) + return append([]string(nil), append(wrapper.masterNodes, wrapper.workerNodes...)...) } func (wrapper *infoWrapper) NodesByType(t machine.Type) []string { @@ -22,9 +22,9 @@ func (wrapper *infoWrapper) NodesByType(t machine.Type) []string { case machine.TypeInit: return nil case machine.TypeControlPlane: - return wrapper.masterNodes + return append([]string(nil), wrapper.masterNodes...) case machine.TypeJoin: - return wrapper.workerNodes + return append([]string(nil), wrapper.workerNodes...) default: panic("unreachable") }