Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preserve bond and ip kernel params #7448

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −19
Open

Preserve bond and ip kernel params #7448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5714b04
Add both 'bond' and 'ip' to the kernel params preserved on install.
jared-gs Jun 22, 2023
2c1abb2
update changes
jared-gs Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion api/resource/definitions/cluster/cluster.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,3 @@ message MemberSpec {
string operating_system = 5;
ControlPlane control_plane = 6;
}

1 change: 0 additions & 1 deletion api/resource/definitions/cri/cri.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ message SeccompProfileSpec {
string name = 1;
google.protobuf.Struct value = 2;
}

1 change: 0 additions & 1 deletion api/resource/definitions/enums/enums.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,4 +330,3 @@ enum RuntimeMachineStage {
MACHINE_STAGE_RESETTING = 7;
MACHINE_STAGE_UPGRADING = 8;
}

1 change: 0 additions & 1 deletion api/resource/definitions/etcd/etcd.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ message SpecSpec {
repeated common.NetIP listen_peer_addresses = 5;
repeated common.NetIP listen_client_addresses = 6;
}

1 change: 0 additions & 1 deletion api/resource/definitions/extensions/extensions.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ message Metadata {
string description = 4;
Compatibility compatibility = 5;
}

1 change: 0 additions & 1 deletion api/resource/definitions/files/files.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ message EtcFileSpecSpec {
message EtcFileStatusSpec {
string spec_version = 1;
}

1 change: 0 additions & 1 deletion api/resource/definitions/hardware/hardware.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ message SystemInformationSpec {
string wake_up_type = 6;
string sku_number = 7;
}

1 change: 0 additions & 1 deletion api/resource/definitions/k8s/k8s.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,3 @@ message StaticPodSpec {
message StaticPodStatusSpec {
google.protobuf.Struct pod_status = 1;
}

1 change: 0 additions & 1 deletion api/resource/definitions/kubeaccess/kubeaccess.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ message ConfigSpec {
repeated string allowed_api_roles = 2;
repeated string allowed_kubernetes_namespaces = 3;
}

1 change: 0 additions & 1 deletion api/resource/definitions/kubespan/kubespan.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@ message PeerStatusSpec {
common.NetIPPort last_used_endpoint = 7;
google.protobuf.Timestamp last_endpoint_change = 8;
}

1 change: 0 additions & 1 deletion api/resource/definitions/network/network.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,4 +322,3 @@ message WireguardSpec {
int64 firewall_mark = 4;
repeated WireguardPeer peers = 5;
}

1 change: 0 additions & 1 deletion api/resource/definitions/perf/perf.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,3 @@ message MemorySpec {
uint64 direct_map2m = 47;
uint64 direct_map1g = 48;
}

1 change: 0 additions & 1 deletion api/resource/definitions/proto/proto.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ message Mount {
string source = 3;
repeated string options = 4;
}

1 change: 0 additions & 1 deletion api/resource/definitions/runtime/runtime.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,3 @@ message UnmetCondition {
string name = 1;
string reason = 2;
}

1 change: 0 additions & 1 deletion api/resource/definitions/secrets/secrets.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,3 @@ message TrustdCertsSpec {
common.PEMEncodedCertificateAndKey ca = 1;
common.PEMEncodedCertificateAndKey server = 2;
}

1 change: 0 additions & 1 deletion api/resource/definitions/siderolink/siderolink.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/defi
message ConfigSpec {
string api_endpoint = 1;
}

1 change: 0 additions & 1 deletion api/resource/definitions/time/time.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ message StatusSpec {
int64 epoch = 2;
bool sync_disabled = 3;
}

1 change: 0 additions & 1 deletion api/resource/definitions/v1alpha1/v1alpha1.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ message ServiceSpec {
bool healthy = 2;
bool unknown = 3;
}

2 changes: 1 addition & 1 deletion internal/app/machined/pkg/controllers/network/cmdline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func ParseCmdlineNetwork(cmdline *procfs.Cmdline) (CmdlineNetworking, error) {
}

// standard ip=
ipSettings := cmdline.Get("ip")
ipSettings := cmdline.Get(constants.KernelParamIP)

for idx := 0; ipSettings.Get(idx) != nil; idx++ {
// https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt
Expand Down
2 changes: 2 additions & 0 deletions internal/pkg/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ func RunInstallerContainer(disk, platform, ref string, cfg configcore.Config, cf
constants.KernelParamEquinixMetalEvents,
constants.KernelParamDashboardDisabled,
constants.KernelParamNetIfnames,
constants.KernelParamBonding,
constants.KernelParamIP,
} {
if c := procfs.ProcCmdline().Get(preservedArg).First(); c != nil {
args = append(args, "--extra-kernel-arg", fmt.Sprintf("%s=%s", preservedArg, *c))
Expand Down
3 changes: 3 additions & 0 deletions pkg/machinery/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ const (
// events sink server.
KernelParamEventsSink = "talos.events.sink"

// KernelParamIP is the kernel parameter name for network interface configuration
KernelParamIP = "ip"

// KernelParamLoggingKernel is the kernel parameter name for specifying the
// kernel log delivery destination.
KernelParamLoggingKernel = "talos.logging.kernel"
Expand Down