Skip to content

Commit 09817b3

Browse files
committed
move generate podsandbox request to platform specific
1 parent ce4de97 commit 09817b3

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-5
lines changed

pkg/kubelet/kuberuntime/kuberuntime_container.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,9 @@ func (m *kubeGenericRuntimeManager) updateContainerResources(pod *v1.Pod, contai
413413
}
414414

415415
func (m *kubeGenericRuntimeManager) updatePodSandboxResources(sandboxID string, pod *v1.Pod) error {
416-
podResourcesRequest := &runtimeapi.UpdatePodSandboxResourcesRequest{
417-
PodSandboxId: sandboxID,
418-
Overhead: m.convertOverheadToLinuxResources(pod),
419-
Resources: m.calculateSandboxResources(pod),
416+
podResourcesRequest := m.generateUpdatePodSandboxResourcesRequest(sandboxID, pod)
417+
if podResourcesRequest == nil {
418+
return fmt.Errorf("sandboxID %q updatePodSandboxResources failed: cannot generate resources config", sandboxID)
420419
}
421420

422421
ctx := context.Background()

pkg/kubelet/kuberuntime/kuberuntime_container_linux.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,15 @@ func (m *kubeGenericRuntimeManager) generateContainerResources(pod *v1.Pod, cont
248248
}
249249
}
250250

251+
// generateUpdatePodSandboxResourcesRequest generates platform specific (linux) podsandox resources config for runtime
252+
func (m *kubeGenericRuntimeManager) generateUpdatePodSandboxResourcesRequest(sandboxID string, pod *v1.Pod) *runtimeapi.UpdatePodSandboxResourcesRequest {
253+
return &runtimeapi.UpdatePodSandboxResourcesRequest{
254+
PodSandboxId: sandboxID,
255+
Overhead: m.convertOverheadToLinuxResources(pod),
256+
Resources: m.calculateSandboxResources(pod),
257+
}
258+
}
259+
251260
// calculateLinuxResources will create the linuxContainerResources type based on the provided CPU and memory resource requests, limits
252261
func (m *kubeGenericRuntimeManager) calculateLinuxResources(cpuRequest, cpuLimit, memoryLimit *resource.Quantity, disableCPUQuota bool) *runtimeapi.LinuxContainerResources {
253262
resources := runtimeapi.LinuxContainerResources{}

pkg/kubelet/kuberuntime/kuberuntime_container_unsupported.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
package kuberuntime
2121

2222
import (
23-
"k8s.io/api/core/v1"
23+
v1 "k8s.io/api/core/v1"
2424
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
2525
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
2626
)
@@ -35,6 +35,11 @@ func (m *kubeGenericRuntimeManager) generateContainerResources(pod *v1.Pod, cont
3535
return nil
3636
}
3737

38+
// generateUpdatePodSandboxResourcesRequest generates platform specific podsandox resources config for runtime
39+
func (m *kubeGenericRuntimeManager) generateUpdatePodSandboxResourcesRequest(sandboxID string, pod *v1.Pod) *runtimeapi.UpdatePodSandboxResourcesRequest {
40+
return nil
41+
}
42+
3843
func toKubeContainerResources(statusResources *runtimeapi.ContainerResources) *kubecontainer.ContainerResources {
3944
return nil
4045
}

pkg/kubelet/kuberuntime/kuberuntime_container_windows.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ func (m *kubeGenericRuntimeManager) generateContainerResources(pod *v1.Pod, cont
4747
}
4848
}
4949

50+
// generateUpdatePodSandboxResourcesRequest generates platform specific podsandox resources config for runtime
51+
func (m *kubeGenericRuntimeManager) generateUpdatePodSandboxResourcesRequest(sandboxID string, pod *v1.Pod) *runtimeapi.UpdatePodSandboxResourcesRequest {
52+
return &runtimeapi.UpdatePodSandboxResourcesRequest{
53+
PodSandboxId: sandboxID,
54+
}
55+
}
56+
5057
// generateWindowsContainerResources generates windows container resources config for runtime
5158
func (m *kubeGenericRuntimeManager) generateWindowsContainerResources(pod *v1.Pod, container *v1.Container) *runtimeapi.WindowsContainerResources {
5259
wcr := m.calculateWindowsResources(container.Resources.Limits.Cpu(), container.Resources.Limits.Memory())

0 commit comments

Comments
 (0)