mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	vendor: bump runc to 1.0.0 pre
This is to check if runc 1.0.0 (to be released shortly) works with k8s. The commands used were (roughly): hack/pin-dependency.sh github.com/opencontainers/runc v1.0.0 hack/lint-dependencies.sh # Follow its recommendations. hack/pin-dependency.sh github.com/cilium/ebpf v0.6.1 hack/pin-dependency.sh github.com/opencontainers/selinux v1.8.2 hack/pin-dependency.sh github.com/sirupsen/logrus v1.8.1 # Recheck. hack/lint-dependencies.sh GO111MODULE=on go mod edit -dropreplace github.com/willf/bitset hack/update-vendor.sh # Recheck. hack/lint-dependencies.sh hack/update-internal-modules.sh # Recheck. hack/lint-dependencies.sh [v2: rebased, updated runc 3a0234e1fe2e82 -> 2f8e8e9d977500] [v3: testing master + runc pr 3019] [v4: updated to 93a01cd4d0b7a0f08a] [v5: updated to f093cca13d3cf8a484] [v6: rebased] [v7: updated to runc v1.0.0] [v8: rebased] Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
		
							
								
								
									
										30
									
								
								vendor/github.com/opencontainers/runc/libcontainer/process_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										30
									
								
								vendor/github.com/opencontainers/runc/libcontainer/process_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -188,7 +188,7 @@ func (p *setnsProcess) start() (retErr error) { | ||||
| 	} | ||||
| 	// Must be done after Shutdown so the child will exit and we can wait for it. | ||||
| 	if ierr != nil { | ||||
| 		p.wait() | ||||
| 		_, _ = p.wait() | ||||
| 		return ierr | ||||
| 	} | ||||
| 	return nil | ||||
| @@ -201,16 +201,16 @@ func (p *setnsProcess) start() (retErr error) { | ||||
| func (p *setnsProcess) execSetns() error { | ||||
| 	status, err := p.cmd.Process.Wait() | ||||
| 	if err != nil { | ||||
| 		p.cmd.Wait() | ||||
| 		_ = p.cmd.Wait() | ||||
| 		return newSystemErrorWithCause(err, "waiting on setns process to finish") | ||||
| 	} | ||||
| 	if !status.Success() { | ||||
| 		p.cmd.Wait() | ||||
| 		_ = p.cmd.Wait() | ||||
| 		return newSystemError(&exec.ExitError{ProcessState: status}) | ||||
| 	} | ||||
| 	var pid *pid | ||||
| 	if err := json.NewDecoder(p.messageSockPair.parent).Decode(&pid); err != nil { | ||||
| 		p.cmd.Wait() | ||||
| 		_ = p.cmd.Wait() | ||||
| 		return newSystemErrorWithCause(err, "reading pid from init pipe") | ||||
| 	} | ||||
|  | ||||
| @@ -292,7 +292,7 @@ func (p *initProcess) externalDescriptors() []string { | ||||
| func (p *initProcess) getChildPid() (int, error) { | ||||
| 	var pid pid | ||||
| 	if err := json.NewDecoder(p.messageSockPair.parent).Decode(&pid); err != nil { | ||||
| 		p.cmd.Wait() | ||||
| 		_ = p.cmd.Wait() | ||||
| 		return -1, err | ||||
| 	} | ||||
|  | ||||
| @@ -309,11 +309,11 @@ func (p *initProcess) getChildPid() (int, error) { | ||||
| func (p *initProcess) waitForChildExit(childPid int) error { | ||||
| 	status, err := p.cmd.Process.Wait() | ||||
| 	if err != nil { | ||||
| 		p.cmd.Wait() | ||||
| 		_ = p.cmd.Wait() | ||||
| 		return err | ||||
| 	} | ||||
| 	if !status.Success() { | ||||
| 		p.cmd.Wait() | ||||
| 		_ = p.cmd.Wait() | ||||
| 		return &exec.ExitError{ProcessState: status} | ||||
| 	} | ||||
|  | ||||
| @@ -327,12 +327,12 @@ func (p *initProcess) waitForChildExit(childPid int) error { | ||||
| } | ||||
|  | ||||
| func (p *initProcess) start() (retErr error) { | ||||
| 	defer p.messageSockPair.parent.Close() | ||||
| 	defer p.messageSockPair.parent.Close() //nolint: errcheck | ||||
| 	err := p.cmd.Start() | ||||
| 	p.process.ops = p | ||||
| 	// close the write-side of the pipes (controlled by child) | ||||
| 	p.messageSockPair.child.Close() | ||||
| 	p.logFilePair.child.Close() | ||||
| 	_ = p.messageSockPair.child.Close() | ||||
| 	_ = p.logFilePair.child.Close() | ||||
| 	if err != nil { | ||||
| 		p.process.ops = nil | ||||
| 		return newSystemErrorWithCause(err, "starting init process command") | ||||
| @@ -371,9 +371,9 @@ func (p *initProcess) start() (retErr error) { | ||||
| 				logrus.WithError(err).Warn("unable to terminate initProcess") | ||||
| 			} | ||||
|  | ||||
| 			p.manager.Destroy() | ||||
| 			_ = p.manager.Destroy() | ||||
| 			if p.intelRdtManager != nil { | ||||
| 				p.intelRdtManager.Destroy() | ||||
| 				_ = p.intelRdtManager.Destroy() | ||||
| 			} | ||||
| 		} | ||||
| 	}() | ||||
| @@ -553,7 +553,7 @@ func (p *initProcess) start() (retErr error) { | ||||
|  | ||||
| 	// Must be done after Shutdown so the child will exit and we can wait for it. | ||||
| 	if ierr != nil { | ||||
| 		p.wait() | ||||
| 		_, _ = p.wait() | ||||
| 		return ierr | ||||
| 	} | ||||
| 	return nil | ||||
| @@ -563,7 +563,7 @@ func (p *initProcess) wait() (*os.ProcessState, error) { | ||||
| 	err := p.cmd.Wait() | ||||
| 	// we should kill all processes in cgroup when init is died if we use host PID namespace | ||||
| 	if p.sharePidns { | ||||
| 		signalAllProcesses(p.manager, unix.SIGKILL) | ||||
| 		_ = signalAllProcesses(p.manager, unix.SIGKILL) | ||||
| 	} | ||||
| 	return p.cmd.ProcessState, err | ||||
| } | ||||
| @@ -668,7 +668,7 @@ func (p *Process) InitializeIO(rootuid, rootgid int) (i *IO, err error) { | ||||
| 	defer func() { | ||||
| 		if err != nil { | ||||
| 			for _, fd := range fds { | ||||
| 				unix.Close(int(fd)) | ||||
| 				_ = unix.Close(int(fd)) | ||||
| 			} | ||||
| 		} | ||||
| 	}() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user