Merge pull request #57076 from feiskyer/win-resources

Automatic merge from submit-queue (batch tested with PRs 59097, 57076, 59295). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add windows config to Kubelet CRI **What this PR does / why we need it**: Currently Container Runtime Interface (CRI) only supports LinuxContainerConfig and therefore LinuxContainerResources in ContainerConfig. Windows resource config is different from Linux's, although it shares some common properties. This PR adds windows config to CRI. Add newly added WindowsContainerResources is original from OCI spec (see https://github.com/opencontainers/runtime-spec/blob/master/specs-go/config.go#L437). **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: First part of #56734. A further PR is needed to fill the values after we have agreement on the spec. **Special notes for your reviewer**: **Release note**: ```release-note Add windows config to Kubelet CRI ``` /assign @yujuhong @brendandburns /cc @taylorb-microsoft @JiangtianLi @dchen1107

Merge pull request #57076 from feiskyer/win-resources
f02e37b6 · Kubernetes Submit Queue · GitHub · a8581f41 · 997b33e2 · f02e37b6
Unverified Commit f02e37b6 authored Feb 02, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 0 deletions

api.pb.go pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go +0 -0

api.proto pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto +22 -0

No files found.
--- a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go
+++ b/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go
--- a/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto
+++ b/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto
@@ -560,6 +560,26 @@ message LinuxContainerConfig {
    LinuxContainerSecurityContext security_context = 2;
 }

+// WindowsContainerConfig contains platform-specific configuration for
+// Windows-based containers.
+message WindowsContainerConfig {
+    // Resources specification for the container.
+    WindowsContainerResources resources = 1;
+}
+
+// WindowsContainerResources specifies Windows specific configuration for
+// resources.
+message WindowsContainerResources {
+    // CPU shares (relative weight vs. other containers). Default: 0 (not specified).
+    int64 cpu_shares = 1;
+    // Number of CPUs available to the container. Default: 0 (not specified).
+    int64 cpu_count = 2;
+    // Specifies the portion of processor cycles that this container can use as a percentage times 100.
+    int64 cpu_maximum = 3;
+    // Memory limit in bytes. Default: 0 (not specified).
+    int64 memory_limit_in_bytes = 4;
+}
+
 // ContainerMetadata holds all necessary information for building the container
 // name. The container runtime is encouraged to expose the metadata in its user
 // interface for better user experience. E.g., runtime can construct a unique
@@ -647,6 +667,8 @@ message ContainerConfig {

    // Configuration specific to Linux containers.
    LinuxContainerConfig linux = 15;
+   // Configuration specific to Windows containers.
+   WindowsContainerConfig windows = 16;
 }

 message CreateContainerRequest {