diff --git a/src/initramfs/cmd/init/main.go b/src/initramfs/cmd/init/main.go index 21467c315..9ac289e33 100644 --- a/src/initramfs/cmd/init/main.go +++ b/src/initramfs/cmd/init/main.go @@ -122,10 +122,14 @@ func root() (err error) { case constants.ContainerRuntimeCRIO: services.Start(&service.CRIO{}) default: - panic(fmt.Errorf("Unknown container runtime: %s", data.Services.Kubeadm.ContainerRuntime)) + panic(fmt.Errorf("unknown container runtime: %s", data.Services.Kubeadm.ContainerRuntime)) } + services.Start(&service.Kubelet{}) - services.Start(&service.Kubeadm{}) + + if _, err := os.Stat("/etc/kubernetes/kubelet.conf"); os.IsNotExist(err) { + services.Start(&service.Kubeadm{}) + } return nil } diff --git a/src/initramfs/cmd/init/pkg/rootfs/etc/etc.go b/src/initramfs/cmd/init/pkg/rootfs/etc/etc.go index fdbea154d..ba00216ea 100644 --- a/src/initramfs/cmd/init/pkg/rootfs/etc/etc.go +++ b/src/initramfs/cmd/init/pkg/rootfs/etc/etc.go @@ -56,6 +56,11 @@ func Hosts(s, hostname, ip string) (err error) { if err := ioutil.WriteFile(path.Join(s, "/var/run/hosts"), writer.Bytes(), 0644); err != nil { return fmt.Errorf("write /etc/hosts: %v", err) } + if _, err := os.Lstat(path.Join(s, "/etc/hosts")); err == nil { + if err = os.Remove(path.Join(s, "/etc/hosts")); err != nil { + return fmt.Errorf("remove symlink /etc/hosts: %v", err) + } + } // The kubelet wants to manage /etc/hosts. Create a symlink there that // points to a writable file. if err := os.Symlink("/var/run/hosts", path.Join(s, "/etc/hosts")); err != nil { @@ -68,6 +73,11 @@ func Hosts(s, hostname, ip string) (err error) { // ResolvConf symlinks /proc/net/pnp to /etc/resolv.conf. See // https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt. func ResolvConf(s string) (err error) { + if _, err = os.Lstat(path.Join(s, "/etc/resolv.conf")); err == nil { + if err = os.Remove(path.Join(s, "/etc/resolv.conf")); err != nil { + return fmt.Errorf("remove symlink /etc/hosts: %v", err) + } + } if err = os.Symlink("/proc/net/pnp", path.Join(s, "/etc/resolv.conf")); err != nil { return } diff --git a/src/initramfs/cmd/init/pkg/service/crio.go b/src/initramfs/cmd/init/pkg/service/crio.go index 64a6702a7..e0e702396 100644 --- a/src/initramfs/cmd/init/pkg/service/crio.go +++ b/src/initramfs/cmd/init/pkg/service/crio.go @@ -197,10 +197,12 @@ func (p *CRIO) Pre(data userdata.UserData) error { } // Cmd implements the Service interface. -func (p *CRIO) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { +func (p *CRIO) Cmd(data userdata.UserData, cmdArgs *CmdArgs) error { cmdArgs.Name = "crio" cmdArgs.Path = "/bin/crio" cmdArgs.Args = []string{} + + return nil } // Condition implements the Service interface. diff --git a/src/initramfs/cmd/init/pkg/service/docker.go b/src/initramfs/cmd/init/pkg/service/docker.go index 8a0d16461..e4acb72d3 100644 --- a/src/initramfs/cmd/init/pkg/service/docker.go +++ b/src/initramfs/cmd/init/pkg/service/docker.go @@ -15,7 +15,7 @@ func (p *Docker) Pre(data userdata.UserData) error { } // Cmd implements the Service interface. -func (p *Docker) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { +func (p *Docker) Cmd(data userdata.UserData, cmdArgs *CmdArgs) error { cmdArgs.Name = "docker" cmdArgs.Path = "/bin/dockerd" cmdArgs.Args = []string{ @@ -28,6 +28,8 @@ func (p *Docker) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { "--log-opt=max-size=10m", "--log-opt=max-file=3", } + + return nil } // Condition implements the Service interface. diff --git a/src/initramfs/cmd/init/pkg/service/kubeadm.go b/src/initramfs/cmd/init/pkg/service/kubeadm.go index 4a94775a3..8a751eae0 100644 --- a/src/initramfs/cmd/init/pkg/service/kubeadm.go +++ b/src/initramfs/cmd/init/pkg/service/kubeadm.go @@ -32,7 +32,7 @@ func (p *Kubeadm) Pre(data userdata.UserData) (err error) { } // Cmd implements the Service interface. -func (p *Kubeadm) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { +func (p *Kubeadm) Cmd(data userdata.UserData, cmdArgs *CmdArgs) error { var cmd string if data.Services.Kubeadm.Init { cmd = "init" @@ -75,6 +75,8 @@ func (p *Kubeadm) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { if data.Services.Kubeadm.Init { cmdArgs.Args = append(cmdArgs.Args, "--skip-token-print") } + + return nil } // Condition implements the Service interface. diff --git a/src/initramfs/cmd/init/pkg/service/kubelet.go b/src/initramfs/cmd/init/pkg/service/kubelet.go index 0f9b8b9d4..47da12aed 100644 --- a/src/initramfs/cmd/init/pkg/service/kubelet.go +++ b/src/initramfs/cmd/init/pkg/service/kubelet.go @@ -34,7 +34,7 @@ func (p *Kubelet) Pre(data userdata.UserData) error { } // Cmd implements the Service interface. -func (p *Kubelet) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { +func (p *Kubelet) Cmd(data userdata.UserData, cmdArgs *CmdArgs) error { cmdArgs.Name = "kubelet" cmdArgs.Path = "/bin/docker" cmdArgs.Args = []string{ @@ -71,7 +71,7 @@ func (p *Kubelet) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { fileBytes, err := ioutil.ReadFile("/var/lib/kubelet/kubeadm-flags.env") if err != nil { - panic(err) + return err } argsString := strings.TrimPrefix(string(fileBytes), "KUBELET_KUBEADM_ARGS=") argsString = strings.TrimSuffix(argsString, "\n") @@ -84,6 +84,8 @@ func (p *Kubelet) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { cmdArgs.Args = append(cmdArgs.Args, "--container-runtime=remote", "--container-runtime-endpoint=unix:///var/run/crio/crio.sock") default: } + + return nil } // Condition implements the Service interface. diff --git a/src/initramfs/cmd/init/pkg/service/osd.go b/src/initramfs/cmd/init/pkg/service/osd.go index 6238c9c3a..a485cb50c 100644 --- a/src/initramfs/cmd/init/pkg/service/osd.go +++ b/src/initramfs/cmd/init/pkg/service/osd.go @@ -17,7 +17,7 @@ func (p *OSD) Pre(data userdata.UserData) error { } // Cmd implements the Service interface. -func (p *OSD) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { +func (p *OSD) Cmd(data userdata.UserData, cmdArgs *CmdArgs) error { cmdArgs.Name = "osd" cmdArgs.Path = "/bin/osd" cmdArgs.Args = []string{ @@ -28,6 +28,8 @@ func (p *OSD) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { if !data.Services.Kubeadm.Init { cmdArgs.Args = append(cmdArgs.Args, "--generate=true") } + + return nil } // Condition implements the Service interface. diff --git a/src/initramfs/cmd/init/pkg/service/proxyd.go b/src/initramfs/cmd/init/pkg/service/proxyd.go index 22f5a5b39..3706bdb11 100644 --- a/src/initramfs/cmd/init/pkg/service/proxyd.go +++ b/src/initramfs/cmd/init/pkg/service/proxyd.go @@ -16,10 +16,12 @@ func (p *ProxyD) Pre(data userdata.UserData) error { } // Cmd implements the Service interface. -func (p *ProxyD) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { +func (p *ProxyD) Cmd(data userdata.UserData, cmdArgs *CmdArgs) error { cmdArgs.Name = "proxyd" cmdArgs.Path = "/bin/proxyd" cmdArgs.Args = []string{} + + return nil } // Condition implements the Service interface. diff --git a/src/initramfs/cmd/init/pkg/service/rotd.go b/src/initramfs/cmd/init/pkg/service/rotd.go index 3e77832e8..31a650ea4 100644 --- a/src/initramfs/cmd/init/pkg/service/rotd.go +++ b/src/initramfs/cmd/init/pkg/service/rotd.go @@ -17,13 +17,15 @@ func (p *ROTD) Pre(data userdata.UserData) error { } // Cmd implements the Service interface. -func (p *ROTD) Cmd(data userdata.UserData, cmdArgs *CmdArgs) { +func (p *ROTD) Cmd(data userdata.UserData, cmdArgs *CmdArgs) error { cmdArgs.Name = "rotd" cmdArgs.Path = "/bin/rotd" cmdArgs.Args = []string{ "--port=50001", "--userdata=" + constants.UserDataPath, } + + return nil } // Condition implements the Service interface. diff --git a/src/initramfs/cmd/init/pkg/service/service.go b/src/initramfs/cmd/init/pkg/service/service.go index f91f8ce37..841dc51ea 100644 --- a/src/initramfs/cmd/init/pkg/service/service.go +++ b/src/initramfs/cmd/init/pkg/service/service.go @@ -31,7 +31,7 @@ type Service interface { Pre(userdata.UserData) error // Cmd describes the path to the binary, and the set of arguments to be // passed into it upon execution. - Cmd(userdata.UserData, *CmdArgs) + Cmd(userdata.UserData, *CmdArgs) error // Condition is invoked just before starting the process. Condition(userdata.UserData) func() (bool, error) // Env describes the service's environment variables. Elements should be in @@ -58,7 +58,10 @@ type CmdArgs struct { func (m *Manager) build(proc Service) (cmd *exec.Cmd, err error) { cmdArgs := &CmdArgs{} // Build the exec.Cmd - proc.Cmd(m.UserData, cmdArgs) + if err = proc.Cmd(m.UserData, cmdArgs); err != nil { + err = fmt.Errorf("new command: %v", err) + return + } cmd = exec.Command(cmdArgs.Path, cmdArgs.Args...) // Set the environment for the service. @@ -117,14 +120,20 @@ func (m *Manager) Start(proc Service) { func (m *Manager) waitAndRestart(proc Service) (err error) { cmd, err := m.build(proc) if err != nil { - return + log.Printf("%v", err) + time.Sleep(5 * time.Second) + return m.waitAndRestart(proc) } if err = cmd.Start(); err != nil { - return + log.Printf("%v", err) + time.Sleep(5 * time.Second) + return m.waitAndRestart(proc) } state, err := cmd.Process.Wait() if err != nil { - return + log.Printf("%v", err) + time.Sleep(5 * time.Second) + return m.waitAndRestart(proc) } if state.Exited() { time.Sleep(5 * time.Second) diff --git a/src/initramfs/cmd/osctl/cmd/reboot.go b/src/initramfs/cmd/osctl/cmd/reboot.go new file mode 100644 index 000000000..769b10cd8 --- /dev/null +++ b/src/initramfs/cmd/osctl/cmd/reboot.go @@ -0,0 +1,36 @@ +package cmd + +import ( + "fmt" + "os" + + "github.com/autonomy/dianemo/src/initramfs/cmd/osctl/pkg/client" + "github.com/spf13/cobra" +) + +// rebootCmd represents the reboot command +var rebootCmd = &cobra.Command{ + Use: "reboot", + Short: "Reboot a node", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + creds, err := client.NewDefaultClientCredentials() + if err != nil { + fmt.Println(err) + os.Exit(1) + } + c, err := client.NewClient(port, creds) + if err != nil { + fmt.Println(err) + os.Exit(1) + } + if err := c.Reboot(); err != nil { + fmt.Println(err) + os.Exit(1) + } + }, +} + +func init() { + rootCmd.AddCommand(rebootCmd) +} diff --git a/src/initramfs/cmd/osctl/cmd/reset.go b/src/initramfs/cmd/osctl/cmd/reset.go new file mode 100644 index 000000000..9a2d4ffa3 --- /dev/null +++ b/src/initramfs/cmd/osctl/cmd/reset.go @@ -0,0 +1,36 @@ +package cmd + +import ( + "fmt" + "os" + + "github.com/autonomy/dianemo/src/initramfs/cmd/osctl/pkg/client" + "github.com/spf13/cobra" +) + +// resetCmd represents the reset command +var resetCmd = &cobra.Command{ + Use: "reset", + Short: "Reset a node", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + creds, err := client.NewDefaultClientCredentials() + if err != nil { + fmt.Println(err) + os.Exit(1) + } + c, err := client.NewClient(port, creds) + if err != nil { + fmt.Println(err) + os.Exit(1) + } + if err := c.Reset(); err != nil { + fmt.Println(err) + os.Exit(1) + } + }, +} + +func init() { + rootCmd.AddCommand(resetCmd) +} diff --git a/src/initramfs/cmd/osctl/cmd/restart.go b/src/initramfs/cmd/osctl/cmd/restart.go index c9f4c286e..76a9bf49d 100644 --- a/src/initramfs/cmd/osctl/cmd/restart.go +++ b/src/initramfs/cmd/osctl/cmd/restart.go @@ -2,7 +2,6 @@ package cmd import ( "fmt" - "log" "os" "github.com/autonomy/dianemo/src/initramfs/cmd/osctl/pkg/client" @@ -14,7 +13,7 @@ var ( timeout int32 ) -// restartCmd represents the processes command +// restartCmd represents the restart command var restartCmd = &cobra.Command{ Use: "restart", Short: "Restart a process", @@ -33,13 +32,15 @@ var restartCmd = &cobra.Command{ } c, err := client.NewClient(port, creds) if err != nil { - log.Fatal(err) + fmt.Println(err) + os.Exit(1) } r := &proto.RestartRequest{ Id: args[0], Timeout: timeout, } if err := c.Restart(r); err != nil { + fmt.Println(err) os.Exit(1) } }, diff --git a/src/initramfs/cmd/osctl/pkg/client/client.go b/src/initramfs/cmd/osctl/pkg/client/client.go index 5b90ebfe1..f1cb19dfe 100644 --- a/src/initramfs/cmd/osctl/pkg/client/client.go +++ b/src/initramfs/cmd/osctl/pkg/client/client.go @@ -140,6 +140,28 @@ func (c *Client) Restart(r *proto.RestartRequest) (err error) { return nil } +// Reset implements the proto.OSDClient interface. +func (c *Client) Reset() (err error) { + ctx := context.Background() + _, err = c.client.Reset(ctx, &empty.Empty{}) + if err != nil { + return + } + + return nil +} + +// Reboot implements the proto.OSDClient interface. +func (c *Client) Reboot() (err error) { + ctx := context.Background() + _, err = c.client.Reboot(ctx, &empty.Empty{}) + if err != nil { + return + } + + return nil +} + // Dmesg implements the proto.OSDClient interface. // nolint: dupl func (c *Client) Dmesg() (err error) { diff --git a/src/initramfs/cmd/osd/pkg/reg/reg.go b/src/initramfs/cmd/osd/pkg/reg/reg.go index 1a0705e63..10a84e3d7 100644 --- a/src/initramfs/cmd/osd/pkg/reg/reg.go +++ b/src/initramfs/cmd/osd/pkg/reg/reg.go @@ -7,6 +7,7 @@ import ( "fmt" "io/ioutil" "os" + "os/exec" "strings" "time" @@ -97,6 +98,78 @@ func (r *Registrator) Restart(ctx context.Context, in *proto.RestartRequest) (re return } +// Reset implements the proto.OSDServer interface. +func (r *Registrator) Reset(ctx context.Context, in *empty.Empty) (reply *proto.ResetReply, err error) { + + { + cmd := exec.Command("/bin/docker", "stop", "kubelet") + + // Set the environment for the service. + cmd.Env = []string{fmt.Sprintf("PATH=%s", constants.PATH)} + + if err = cmd.Start(); err != nil { + return + } + _, err = cmd.Process.Wait() + if err != nil { + return + } + } + + args := []string{ + "run", + "--rm", + "--net=host", + "--pid=host", + "--privileged", + "--volume=/sys:/sys:rw", + "--volume=/sys/fs/cgroup:/sys/fs/cgroup:rw", + "--volume=/var/run:/var/run:rw", + "--volume=/run:/run:rw", + "--volume=/var/lib/docker:/var/lib/docker:rw", + "--volume=/var/lib/kubelet:/var/lib/kubelet:slave", + "--volume=/var/log:/var/log", + "--volume=/etc/kubernetes:/etc/kubernetes:shared", + "--volume=/etc/os-release:/etc/os-release:ro", + "--volume=/lib/modules:/lib/modules:ro", + "--volume=/bin/docker:/bin/docker:ro", + "--volume=/bin/crictl:/bin/crictl:ro", + "--volume=/bin/kubeadm:/bin/kubeadm:ro", + "--name=kubeadm", + "gcr.io/google_containers/hyperkube:v1.11.2", + "/bin/kubeadm", + "reset", + "--force", + } + + // Build the exec.Cmd + cmd := exec.Command("/bin/docker", args...) + + // Set the environment for the service. + cmd.Env = []string{fmt.Sprintf("PATH=%s", constants.PATH)} + + if err = cmd.Start(); err != nil { + return + } + _, err = cmd.Process.Wait() + if err != nil { + return + } + + reply = &proto.ResetReply{} + + return +} + +// Reboot implements the proto.OSDServer interface. +func (r *Registrator) Reboot(ctx context.Context, in *empty.Empty) (reply *proto.RebootReply, err error) { + unix.Reboot(int(unix.LINUX_REBOOT_CMD_RESTART)) + + reply = &proto.RebootReply{} + + return +} + // Dmesg implements the proto.OSDServer interface. The klogctl syscall is used // to read from the ring buffer at /proc/kmsg by taking the // SYSLOG_ACTION_READ_ALL action. This action reads all messages remaining in diff --git a/src/initramfs/cmd/osd/proto/api.pb.go b/src/initramfs/cmd/osd/proto/api.pb.go index 124a19d21..372b25569 100644 --- a/src/initramfs/cmd/osd/proto/api.pb.go +++ b/src/initramfs/cmd/osd/proto/api.pb.go @@ -36,7 +36,7 @@ func (m *ProcessesReply) Reset() { *m = ProcessesReply{} } func (m *ProcessesReply) String() string { return proto.CompactTextString(m) } func (*ProcessesReply) ProtoMessage() {} func (*ProcessesReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_682c95cee7fe52e8, []int{0} + return fileDescriptor_api_b55c1a69b0d04a74, []int{0} } func (m *ProcessesReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProcessesReply.Unmarshal(m, b) @@ -78,7 +78,7 @@ func (m *Process) Reset() { *m = Process{} } func (m *Process) String() string { return proto.CompactTextString(m) } func (*Process) ProtoMessage() {} func (*Process) Descriptor() ([]byte, []int) { - return fileDescriptor_api_682c95cee7fe52e8, []int{1} + return fileDescriptor_api_b55c1a69b0d04a74, []int{1} } func (m *Process) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Process.Unmarshal(m, b) @@ -139,7 +139,7 @@ func (m *RestartRequest) Reset() { *m = RestartRequest{} } func (m *RestartRequest) String() string { return proto.CompactTextString(m) } func (*RestartRequest) ProtoMessage() {} func (*RestartRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_682c95cee7fe52e8, []int{2} + return fileDescriptor_api_b55c1a69b0d04a74, []int{2} } func (m *RestartRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestartRequest.Unmarshal(m, b) @@ -184,7 +184,7 @@ func (m *RestartReply) Reset() { *m = RestartReply{} } func (m *RestartReply) String() string { return proto.CompactTextString(m) } func (*RestartReply) ProtoMessage() {} func (*RestartReply) Descriptor() ([]byte, []int) { - return fileDescriptor_api_682c95cee7fe52e8, []int{3} + return fileDescriptor_api_b55c1a69b0d04a74, []int{3} } func (m *RestartReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestartReply.Unmarshal(m, b) @@ -204,6 +204,68 @@ func (m *RestartReply) XXX_DiscardUnknown() { var xxx_messageInfo_RestartReply proto.InternalMessageInfo +// The response message containing the restart status. +type ResetReply struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ResetReply) Reset() { *m = ResetReply{} } +func (m *ResetReply) String() string { return proto.CompactTextString(m) } +func (*ResetReply) ProtoMessage() {} +func (*ResetReply) Descriptor() ([]byte, []int) { + return fileDescriptor_api_b55c1a69b0d04a74, []int{4} +} +func (m *ResetReply) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ResetReply.Unmarshal(m, b) +} +func (m *ResetReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ResetReply.Marshal(b, m, deterministic) +} +func (dst *ResetReply) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResetReply.Merge(dst, src) +} +func (m *ResetReply) XXX_Size() int { + return xxx_messageInfo_ResetReply.Size(m) +} +func (m *ResetReply) XXX_DiscardUnknown() { + xxx_messageInfo_ResetReply.DiscardUnknown(m) +} + +var xxx_messageInfo_ResetReply proto.InternalMessageInfo + +// The response message containing the restart status. +type RebootReply struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RebootReply) Reset() { *m = RebootReply{} } +func (m *RebootReply) String() string { return proto.CompactTextString(m) } +func (*RebootReply) ProtoMessage() {} +func (*RebootReply) Descriptor() ([]byte, []int) { + return fileDescriptor_api_b55c1a69b0d04a74, []int{5} +} +func (m *RebootReply) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_RebootReply.Unmarshal(m, b) +} +func (m *RebootReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_RebootReply.Marshal(b, m, deterministic) +} +func (dst *RebootReply) XXX_Merge(src proto.Message) { + xxx_messageInfo_RebootReply.Merge(dst, src) +} +func (m *RebootReply) XXX_Size() int { + return xxx_messageInfo_RebootReply.Size(m) +} +func (m *RebootReply) XXX_DiscardUnknown() { + xxx_messageInfo_RebootReply.DiscardUnknown(m) +} + +var xxx_messageInfo_RebootReply proto.InternalMessageInfo + // The request message containing the process name. type LogsRequest struct { Process string `protobuf:"bytes,1,opt,name=process,proto3" json:"process,omitempty"` @@ -217,7 +279,7 @@ func (m *LogsRequest) Reset() { *m = LogsRequest{} } func (m *LogsRequest) String() string { return proto.CompactTextString(m) } func (*LogsRequest) ProtoMessage() {} func (*LogsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_api_682c95cee7fe52e8, []int{4} + return fileDescriptor_api_b55c1a69b0d04a74, []int{6} } func (m *LogsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LogsRequest.Unmarshal(m, b) @@ -263,7 +325,7 @@ func (m *Data) Reset() { *m = Data{} } func (m *Data) String() string { return proto.CompactTextString(m) } func (*Data) ProtoMessage() {} func (*Data) Descriptor() ([]byte, []int) { - return fileDescriptor_api_682c95cee7fe52e8, []int{5} + return fileDescriptor_api_b55c1a69b0d04a74, []int{7} } func (m *Data) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Data.Unmarshal(m, b) @@ -295,6 +357,8 @@ func init() { proto.RegisterType((*Process)(nil), "proto.Process") proto.RegisterType((*RestartRequest)(nil), "proto.RestartRequest") proto.RegisterType((*RestartReply)(nil), "proto.RestartReply") + proto.RegisterType((*ResetReply)(nil), "proto.ResetReply") + proto.RegisterType((*RebootReply)(nil), "proto.RebootReply") proto.RegisterType((*LogsRequest)(nil), "proto.LogsRequest") proto.RegisterType((*Data)(nil), "proto.Data") } @@ -314,6 +378,8 @@ type OSDClient interface { Kubeconfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) Processes(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ProcessesReply, error) Restart(ctx context.Context, in *RestartRequest, opts ...grpc.CallOption) (*RestartReply, error) + Reset(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ResetReply, error) + Reboot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*RebootReply, error) Logs(ctx context.Context, in *LogsRequest, opts ...grpc.CallOption) (OSD_LogsClient, error) Dmesg(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) Version(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Data, error) @@ -354,6 +420,24 @@ func (c *oSDClient) Restart(ctx context.Context, in *RestartRequest, opts ...grp return out, nil } +func (c *oSDClient) Reset(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ResetReply, error) { + out := new(ResetReply) + err := c.cc.Invoke(ctx, "/proto.OSD/Reset", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *oSDClient) Reboot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*RebootReply, error) { + out := new(RebootReply) + err := c.cc.Invoke(ctx, "/proto.OSD/Reboot", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *oSDClient) Logs(ctx context.Context, in *LogsRequest, opts ...grpc.CallOption) (OSD_LogsClient, error) { stream, err := c.cc.NewStream(ctx, &_OSD_serviceDesc.Streams[0], "/proto.OSD/Logs", opts...) if err != nil { @@ -409,6 +493,8 @@ type OSDServer interface { Kubeconfig(context.Context, *empty.Empty) (*Data, error) Processes(context.Context, *empty.Empty) (*ProcessesReply, error) Restart(context.Context, *RestartRequest) (*RestartReply, error) + Reset(context.Context, *empty.Empty) (*ResetReply, error) + Reboot(context.Context, *empty.Empty) (*RebootReply, error) Logs(*LogsRequest, OSD_LogsServer) error Dmesg(context.Context, *empty.Empty) (*Data, error) Version(context.Context, *empty.Empty) (*Data, error) @@ -472,6 +558,42 @@ func _OSD_Restart_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +func _OSD_Reset_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(empty.Empty) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OSDServer).Reset(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/proto.OSD/Reset", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OSDServer).Reset(ctx, req.(*empty.Empty)) + } + return interceptor(ctx, in, info, handler) +} + +func _OSD_Reboot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(empty.Empty) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OSDServer).Reboot(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/proto.OSD/Reboot", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OSDServer).Reboot(ctx, req.(*empty.Empty)) + } + return interceptor(ctx, in, info, handler) +} + func _OSD_Logs_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(LogsRequest) if err := stream.RecvMsg(m); err != nil { @@ -545,6 +667,14 @@ var _OSD_serviceDesc = grpc.ServiceDesc{ MethodName: "Restart", Handler: _OSD_Restart_Handler, }, + { + MethodName: "Reset", + Handler: _OSD_Reset_Handler, + }, + { + MethodName: "Reboot", + Handler: _OSD_Reboot_Handler, + }, { MethodName: "Dmesg", Handler: _OSD_Dmesg_Handler, @@ -564,31 +694,33 @@ var _OSD_serviceDesc = grpc.ServiceDesc{ Metadata: "api.proto", } -func init() { proto.RegisterFile("api.proto", fileDescriptor_api_682c95cee7fe52e8) } +func init() { proto.RegisterFile("api.proto", fileDescriptor_api_b55c1a69b0d04a74) } -var fileDescriptor_api_682c95cee7fe52e8 = []byte{ - // 364 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0x41, 0xcf, 0x9a, 0x40, - 0x14, 0x14, 0x04, 0x29, 0x4f, 0xc3, 0xe1, 0xb5, 0x35, 0xc4, 0x7a, 0x30, 0x7b, 0x32, 0x69, 0x83, - 0x46, 0x0f, 0x4d, 0x9a, 0xa6, 0x27, 0x3d, 0xb5, 0x49, 0x9b, 0x6d, 0xd2, 0x4b, 0x4f, 0xa0, 0x4f, - 0x42, 0x22, 0x2c, 0x65, 0x97, 0x03, 0xff, 0xae, 0x3f, 0xed, 0x0b, 0xcb, 0xa2, 0x9f, 0x7e, 0xf9, - 0x12, 0x4f, 0xec, 0x0c, 0x33, 0x6f, 0xf7, 0xcd, 0x80, 0x1f, 0x97, 0x59, 0x54, 0x56, 0x42, 0x09, - 0x74, 0xf5, 0x67, 0xf6, 0x21, 0x15, 0x22, 0x3d, 0xd3, 0x4a, 0xa3, 0xa4, 0x3e, 0xad, 0x28, 0x2f, - 0x55, 0xd3, 0x69, 0xd8, 0x37, 0x08, 0x7e, 0x55, 0xe2, 0x40, 0x52, 0x92, 0xe4, 0x54, 0x9e, 0x1b, - 0xfc, 0x04, 0x7e, 0xd9, 0x33, 0xa1, 0xb5, 0x18, 0x2e, 0xc7, 0x9b, 0xa0, 0x13, 0x47, 0x46, 0xc9, - 0xaf, 0x02, 0xf6, 0x17, 0x3c, 0xc3, 0x62, 0x00, 0x76, 0x76, 0x0c, 0xad, 0x85, 0xb5, 0xf4, 0xb9, - 0x9d, 0x1d, 0x11, 0xc1, 0x29, 0xe2, 0x9c, 0x42, 0x5b, 0x33, 0xfa, 0x8c, 0xef, 0xc0, 0x95, 0x2a, - 0x56, 0x14, 0x0e, 0x35, 0xd9, 0x01, 0x9c, 0xc2, 0xa8, 0x3d, 0xd4, 0x32, 0x74, 0x34, 0x6d, 0x10, - 0xfb, 0x02, 0x01, 0x27, 0xa9, 0xe2, 0x4a, 0x71, 0xfa, 0x57, 0x93, 0x54, 0x2f, 0xee, 0x08, 0xc1, - 0x53, 0x59, 0x4e, 0xa2, 0x56, 0xfa, 0x1a, 0x97, 0xf7, 0x90, 0x05, 0x30, 0xb9, 0x78, 0xcb, 0x73, - 0xc3, 0xf6, 0x30, 0xfe, 0x21, 0x52, 0xd9, 0x0f, 0x0a, 0xc1, 0x33, 0x4b, 0x98, 0x69, 0x3d, 0xc4, - 0x39, 0xf8, 0x07, 0x51, 0xa8, 0x38, 0x2b, 0xa8, 0xd2, 0x43, 0xdf, 0xf0, 0x2b, 0xc1, 0xe6, 0xe0, - 0xec, 0x62, 0x15, 0xb7, 0x8b, 0x24, 0x8d, 0xa2, 0xce, 0x3d, 0xe1, 0x1d, 0xd8, 0xfc, 0xb7, 0x61, - 0xf8, 0xf3, 0xf7, 0x0e, 0xb7, 0x00, 0xdf, 0xeb, 0x84, 0x0e, 0xa2, 0x38, 0x65, 0x29, 0x4e, 0xa3, - 0xae, 0x81, 0xa8, 0x6f, 0x20, 0xda, 0xb7, 0x0d, 0xcc, 0xc6, 0x26, 0xd6, 0x76, 0x20, 0x1b, 0xe0, - 0x57, 0xf0, 0x2f, 0x55, 0xbc, 0xea, 0x79, 0x7f, 0x5b, 0x85, 0x29, 0x8d, 0x0d, 0xf0, 0x33, 0x78, - 0x66, 0x5f, 0xec, 0x35, 0xb7, 0xd9, 0xcd, 0xde, 0xde, 0xd3, 0x9d, 0xf1, 0x23, 0x38, 0x6d, 0x30, - 0x88, 0xe6, 0xf7, 0xb3, 0x94, 0xee, 0x5e, 0xb8, 0xb6, 0x30, 0x02, 0x77, 0x97, 0x93, 0x7c, 0x78, - 0xa7, 0x35, 0x78, 0x7f, 0xa8, 0x92, 0x99, 0x28, 0x1e, 0x74, 0x24, 0x23, 0x8d, 0xb6, 0x4f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x41, 0xa8, 0x42, 0xcb, 0xc8, 0x02, 0x00, 0x00, +var fileDescriptor_api_b55c1a69b0d04a74 = []byte{ + // 400 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0x41, 0x6b, 0xd4, 0x40, + 0x18, 0xdd, 0x6c, 0x92, 0x8d, 0xf9, 0xb2, 0x06, 0xfc, 0xd4, 0x12, 0xd6, 0x1e, 0xca, 0x9c, 0x0a, + 0x4a, 0x5a, 0x5a, 0x51, 0x10, 0xf1, 0xb4, 0x3d, 0x29, 0x28, 0x23, 0x78, 0xf1, 0x94, 0x6c, 0xbf, + 0x86, 0xc0, 0x26, 0x13, 0x33, 0x93, 0x43, 0xfe, 0x94, 0xbf, 0x51, 0x32, 0x33, 0x49, 0xec, 0x96, + 0x85, 0x3d, 0x65, 0xde, 0xcb, 0x7b, 0xf3, 0x98, 0xf7, 0x20, 0xcc, 0x9a, 0x32, 0x6d, 0x5a, 0xa1, + 0x04, 0xfa, 0xfa, 0xb3, 0x79, 0x53, 0x08, 0x51, 0xec, 0xe9, 0x4a, 0xa3, 0xbc, 0x7b, 0xb8, 0xa2, + 0xaa, 0x51, 0xbd, 0xd1, 0xb0, 0x2f, 0x10, 0xff, 0x68, 0xc5, 0x8e, 0xa4, 0x24, 0xc9, 0xa9, 0xd9, + 0xf7, 0xf8, 0x0e, 0xc2, 0x66, 0x64, 0x12, 0xe7, 0xc2, 0xbd, 0x8c, 0x6e, 0x62, 0x23, 0x4e, 0xad, + 0x92, 0xcf, 0x02, 0xf6, 0x1b, 0x02, 0xcb, 0x62, 0x0c, 0xcb, 0xf2, 0x3e, 0x71, 0x2e, 0x9c, 0xcb, + 0x90, 0x2f, 0xcb, 0x7b, 0x44, 0xf0, 0xea, 0xac, 0xa2, 0x64, 0xa9, 0x19, 0x7d, 0xc6, 0x57, 0xe0, + 0x4b, 0x95, 0x29, 0x4a, 0x5c, 0x4d, 0x1a, 0x80, 0x67, 0xb0, 0x1a, 0x0e, 0x9d, 0x4c, 0x3c, 0x4d, + 0x5b, 0xc4, 0x3e, 0x41, 0xcc, 0x49, 0xaa, 0xac, 0x55, 0x9c, 0xfe, 0x74, 0x24, 0xd5, 0x93, 0x8c, + 0x04, 0x02, 0x55, 0x56, 0x24, 0x3a, 0xa5, 0x63, 0x7c, 0x3e, 0x42, 0x16, 0xc3, 0x7a, 0xf2, 0x36, + 0xfb, 0x9e, 0xad, 0x01, 0x38, 0x49, 0xb2, 0xe8, 0x39, 0x44, 0x9c, 0x72, 0x21, 0x2c, 0xbc, 0x83, + 0xe8, 0x9b, 0x28, 0xe4, 0x98, 0x92, 0x40, 0x60, 0x5f, 0x68, 0xa3, 0x46, 0x88, 0xe7, 0x10, 0xee, + 0x44, 0xad, 0xb2, 0xb2, 0xa6, 0x56, 0x27, 0x3e, 0xe3, 0x33, 0xc1, 0xce, 0xc1, 0xdb, 0x66, 0x2a, + 0x1b, 0x5e, 0x99, 0xf7, 0x8a, 0x8c, 0x7b, 0xcd, 0x0d, 0xb8, 0xf9, 0xeb, 0x82, 0xfb, 0xfd, 0xe7, + 0x16, 0x6f, 0x01, 0xbe, 0x76, 0x39, 0xed, 0x44, 0xfd, 0x50, 0x16, 0x78, 0x96, 0x9a, 0x79, 0xd2, + 0x71, 0x9e, 0xf4, 0x6e, 0x98, 0x67, 0x13, 0xd9, 0xce, 0x87, 0x0b, 0xd9, 0x02, 0x3f, 0x43, 0x38, + 0xed, 0x74, 0xd4, 0xf3, 0xfa, 0xf1, 0x4e, 0x76, 0x51, 0xb6, 0xc0, 0x8f, 0x10, 0xd8, 0x32, 0x70, + 0xd4, 0x3c, 0x2e, 0x76, 0xf3, 0xf2, 0x90, 0x36, 0xc6, 0xf7, 0xe0, 0xeb, 0xd6, 0x8e, 0x46, 0xbe, + 0x98, 0x7d, 0x34, 0xb9, 0x3e, 0xc0, 0xca, 0xb4, 0x7b, 0xd4, 0x86, 0x93, 0x6d, 0x1e, 0x61, 0x81, + 0x6f, 0xc1, 0x1b, 0x66, 0xc0, 0xf1, 0xef, 0x7f, 0x9b, 0x1c, 0xf4, 0x71, 0xed, 0x60, 0x0a, 0xfe, + 0xb6, 0x22, 0x79, 0x72, 0x83, 0xd7, 0x10, 0xfc, 0xa2, 0x56, 0x96, 0xa2, 0x3e, 0xd1, 0x91, 0xaf, + 0x34, 0xba, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x9c, 0x7e, 0x60, 0x53, 0x03, 0x00, 0x00, } diff --git a/src/initramfs/cmd/osd/proto/api.proto b/src/initramfs/cmd/osd/proto/api.proto index 8daa849bc..e8b10eb56 100644 --- a/src/initramfs/cmd/osd/proto/api.proto +++ b/src/initramfs/cmd/osd/proto/api.proto @@ -10,6 +10,8 @@ service OSD { rpc Kubeconfig(google.protobuf.Empty) returns (Data) {} rpc Processes(google.protobuf.Empty) returns (ProcessesReply) {} rpc Restart(RestartRequest) returns (RestartReply) {} + rpc Reset(google.protobuf.Empty) returns (ResetReply) {} + rpc Reboot(google.protobuf.Empty) returns (RebootReply) {} rpc Logs(LogsRequest) returns (stream Data) {} rpc Dmesg(google.protobuf.Empty) returns (Data) {} rpc Version(google.protobuf.Empty) returns (Data) {} @@ -37,6 +39,12 @@ message RestartRequest { // The response message containing the restart status. message RestartReply {} +// The response message containing the restart status. +message ResetReply {} + +// The response message containing the restart status. +message RebootReply {} + // The request message containing the process name. message LogsRequest { string process = 1;