github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Implementation

Browse Source
This commit is contained in:
Sreeram 2025-03-25 02:02:58 +05:30
parent cc466aa355
commit 94ddb3a98f
4 changed files with 118 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet_pods.go
View File

@ -2299,6 +2299,9 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
if utilfeature.DefaultFeatureGate.Enabled(features.SupplementalGroupsPolicy) { if utilfeature.DefaultFeatureGate.Enabled(features.SupplementalGroupsPolicy) {
status.User = convertContainerStatusUser(cStatus) status.User = convertContainerStatusUser(cStatus)
} }
if utilfeature.DefaultFeatureGate.Enabled(features.ContainerStopSignals) {
status.StopSignal = cStatus.StopSignal
}
if containerSeen[cName] == 0 { if containerSeen[cName] == 0 {
statuses[cName] = status statuses[cName] = status
} else { } else {

96
pkg/kubelet/kuberuntime/helpers.go
View File

@ -26,8 +26,10 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilfeature "k8s.io/apiserver/pkg/util/feature"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/apparmor"
@ -421,3 +423,97 @@ func convertResourceConfigToLinuxContainerResources(rc *cm.ResourceConfig) *runt
return lcr return lcr
} }
var signalNameToRuntimeEnum = map[string]runtimeapi.Signal{
"SIGABRT": runtimeapi.Signal_SIGABRT,
"SIGALRM": runtimeapi.Signal_SIGALRM,
"SIGBUS": runtimeapi.Signal_SIGBUS,
"SIGCHLD": runtimeapi.Signal_SIGCHLD,
"SIGCLD": runtimeapi.Signal_SIGCLD,
"SIGCONT": runtimeapi.Signal_SIGCONT,
"SIGFPE": runtimeapi.Signal_SIGFPE,
"SIGHUP": runtimeapi.Signal_SIGHUP,
"SIGILL": runtimeapi.Signal_SIGILL,
"SIGINT": runtimeapi.Signal_SIGINT,
"SIGIO": runtimeapi.Signal_SIGIO,
"SIGIOT": runtimeapi.Signal_SIGIOT,
"SIGKILL": runtimeapi.Signal_SIGKILL,
"SIGPIPE": runtimeapi.Signal_SIGPIPE,
"SIGPOLL": runtimeapi.Signal_SIGPOLL,
"SIGPROF": runtimeapi.Signal_SIGPROF,
"SIGPWR": runtimeapi.Signal_SIGPWR,
"SIGQUIT": runtimeapi.Signal_SIGQUIT,
"SIGSEGV": runtimeapi.Signal_SIGSEGV,
"SIGSTKFLT": runtimeapi.Signal_SIGSTKFLT,
"SIGSTOP": runtimeapi.Signal_SIGSTOP,
"SIGSYS": runtimeapi.Signal_SIGSYS,
"SIGTERM": runtimeapi.Signal_SIGTERM,
"SIGTRAP": runtimeapi.Signal_SIGTRAP,
"SIGTSTP": runtimeapi.Signal_SIGTSTP,
"SIGTTIN": runtimeapi.Signal_SIGTTIN,
"SIGTTOU": runtimeapi.Signal_SIGTTOU,
"SIGURG": runtimeapi.Signal_SIGURG,
"SIGUSR1": runtimeapi.Signal_SIGUSR1,
"SIGUSR2": runtimeapi.Signal_SIGUSR2,
"SIGVTALRM": runtimeapi.Signal_SIGVTALRM,
"SIGWINCH": runtimeapi.Signal_SIGWINCH,
"SIGXCPU": runtimeapi.Signal_SIGXCPU,
"SIGXFSZ": runtimeapi.Signal_SIGXFSZ,
"SIGRTMIN": runtimeapi.Signal_SIGRTMIN,
"SIGRTMIN+1": runtimeapi.Signal_SIGRTMINPLUS1,
"SIGRTMIN+2": runtimeapi.Signal_SIGRTMINPLUS2,
"SIGRTMIN+3": runtimeapi.Signal_SIGRTMINPLUS3,
"SIGRTMIN+4": runtimeapi.Signal_SIGRTMINPLUS4,
"SIGRTMIN+5": runtimeapi.Signal_SIGRTMINPLUS5,
"SIGRTMIN+6": runtimeapi.Signal_SIGRTMINPLUS6,
"SIGRTMIN+7": runtimeapi.Signal_SIGRTMINPLUS7,
"SIGRTMIN+8": runtimeapi.Signal_SIGRTMINPLUS8,
"SIGRTMIN+9": runtimeapi.Signal_SIGRTMINPLUS9,
"SIGRTMIN+10": runtimeapi.Signal_SIGRTMINPLUS10,
"SIGRTMIN+11": runtimeapi.Signal_SIGRTMINPLUS11,
"SIGRTMIN+12": runtimeapi.Signal_SIGRTMINPLUS12,
"SIGRTMIN+13": runtimeapi.Signal_SIGRTMINPLUS13,
"SIGRTMIN+14": runtimeapi.Signal_SIGRTMINPLUS14,
"SIGRTMIN+15": runtimeapi.Signal_SIGRTMINPLUS15,
"SIGRTMAX-14": runtimeapi.Signal_SIGRTMAXMINUS14,
"SIGRTMAX-13": runtimeapi.Signal_SIGRTMAXMINUS13,
"SIGRTMAX-12": runtimeapi.Signal_SIGRTMAXMINUS12,
"SIGRTMAX-11": runtimeapi.Signal_SIGRTMAXMINUS11,
"SIGRTMAX-10": runtimeapi.Signal_SIGRTMAXMINUS10,
"SIGRTMAX-9": runtimeapi.Signal_SIGRTMAXMINUS9,
"SIGRTMAX-8": runtimeapi.Signal_SIGRTMAXMINUS8,
"SIGRTMAX-7": runtimeapi.Signal_SIGRTMAXMINUS7,
"SIGRTMAX-6": runtimeapi.Signal_SIGRTMAXMINUS6,
"SIGRTMAX-5": runtimeapi.Signal_SIGRTMAXMINUS5,
"SIGRTMAX-4": runtimeapi.Signal_SIGRTMAXMINUS4,
"SIGRTMAX-3": runtimeapi.Signal_SIGRTMAXMINUS3,
"SIGRTMAX-2": runtimeapi.Signal_SIGRTMAXMINUS2,
"SIGRTMAX-1": runtimeapi.Signal_SIGRTMAXMINUS1,
"SIGRTMAX": runtimeapi.Signal_SIGRTMAX,
}
func getContainerConfigStopSignal(container *v1.Container) (stopsignal *runtimeapi.Signal) {
if utilfeature.DefaultFeatureGate.Enabled(features.ContainerStopSignals) {
if container.Lifecycle != nil && container.Lifecycle.StopSignal != nil {
var signalValue runtimeapi.Signal
signalStr := string(*container.Lifecycle.StopSignal)
signalValue = signalNameToRuntimeEnum[signalStr]
return &signalValue
} else {
return nil
}
}
return nil
}
func runtimeSignalToString(signal runtimeapi.Signal) *v1.Signal {
var convertedSignal v1.Signal
for key, value := range signalNameToRuntimeEnum {
if value == signal {
convertedSignal = v1.Signal(key)
}
}
return &convertedSignal
}

15
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@ -360,6 +360,7 @@ func (m *kubeGenericRuntimeManager) generateContainerConfig(ctx context.Context,
return nil, cleanupAction, fmt.Errorf("create container log directory for container %s failed: %v", container.Name, err) return nil, cleanupAction, fmt.Errorf("create container log directory for container %s failed: %v", container.Name, err)
} }
containerLogsPath := buildContainerLogsPath(container.Name, restartCount) containerLogsPath := buildContainerLogsPath(container.Name, restartCount)
stopsignal := getContainerConfigStopSignal(container)
restartCountUint32 := uint32(restartCount) restartCountUint32 := uint32(restartCount)
config := &runtimeapi.ContainerConfig{ config := &runtimeapi.ContainerConfig{
Metadata: &runtimeapi.ContainerMetadata{ Metadata: &runtimeapi.ContainerMetadata{
@ -381,6 +382,9 @@ func (m *kubeGenericRuntimeManager) generateContainerConfig(ctx context.Context,
Tty: container.TTY, Tty: container.TTY,
} }
if stopsignal != nil {
config.StopSignal = *stopsignal
}
// set platform specific configurations. // set platform specific configurations.
if err := m.applyPlatformSpecificContainerConfig(config, container, pod, uid, username, nsTarget); err != nil { if err := m.applyPlatformSpecificContainerConfig(config, container, pod, uid, username, nsTarget); err != nil {
return nil, cleanupAction, err return nil, cleanupAction, err
@ -668,6 +672,16 @@ func toKubeContainerStatus(status *runtimeapi.ContainerStatus, runtimeName strin
cStatusUser = toKubeContainerUser(status.User) cStatusUser = toKubeContainerUser(status.User)
} }
var cStatusStopSignal *v1.Signal
if utilfeature.DefaultFeatureGate.Enabled(features.ContainerStopSignals) {
signal := status.GetStopSignal().String()
// Here Signal_RUNTIME_DEFAULT means that the runtime is not returning any StopSignal
// This happens only when the container runtime version doesn't support StopSignal yet
if signal != "" && signal != "RUNTIME_DEFAULT" {
cStatusStopSignal = runtimeSignalToString(status.GetStopSignal())
}
}
cStatus := &kubecontainer.Status{ cStatus := &kubecontainer.Status{
ID: kubecontainer.ContainerID{ ID: kubecontainer.ContainerID{
Type: runtimeName, Type: runtimeName,
@ -684,6 +698,7 @@ func toKubeContainerStatus(status *runtimeapi.ContainerStatus, runtimeName strin
CreatedAt: time.Unix(0, status.CreatedAt), CreatedAt: time.Unix(0, status.CreatedAt),
Resources: cStatusResources, Resources: cStatusResources,
User: cStatusUser, User: cStatusUser,
StopSignal: cStatusStopSignal,
} }
if status.State != runtimeapi.ContainerState_CONTAINER_CREATED { if status.State != runtimeapi.ContainerState_CONTAINER_CREATED {

4
pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go
View File

@ -55,6 +55,7 @@ func makeExpectedConfig(m *kubeGenericRuntimeManager, pod *v1.Pod, containerInde
restartCount := 0 restartCount := 0
opts, _, _ := m.runtimeHelper.GenerateRunContainerOptions(ctx, pod, container, podIP, []string{podIP}, nil) opts, _, _ := m.runtimeHelper.GenerateRunContainerOptions(ctx, pod, container, podIP, []string{podIP}, nil)
containerLogsPath := buildContainerLogsPath(container.Name, restartCount) containerLogsPath := buildContainerLogsPath(container.Name, restartCount)
stopsignal := getContainerConfigStopSignal(container)
restartCountUint32 := uint32(restartCount) restartCountUint32 := uint32(restartCount)
envs := make([]*runtimeapi.KeyValue, len(opts.Envs)) envs := make([]*runtimeapi.KeyValue, len(opts.Envs))
@ -81,6 +82,9 @@ func makeExpectedConfig(m *kubeGenericRuntimeManager, pod *v1.Pod, containerInde
Envs: envs, Envs: envs,
CDIDevices: makeCDIDevices(opts), CDIDevices: makeCDIDevices(opts),
} }
if stopsignal != nil {
expectedConfig.StopSignal = *stopsignal
}
return expectedConfig return expectedConfig
} }