Merge pull request gardener#2413 from rfranzke/feature/volume-limits

Add support for KUBE_MAX_PD_VOLS for kube-scheduler
nickytd · Jun 5, 2020 · 6d2f8b5 · 6d2f8b5
2 parents 8c22dca + 2324962
commit 6d2f8b5
Show file tree

Hide file tree

Showing 18 changed files with 1,145 additions and 964 deletions.
diff --git a/charts/seed-controlplane/charts/kube-scheduler/templates/kube-scheduler.yaml b/charts/seed-controlplane/charts/kube-scheduler/templates/kube-scheduler.yaml
@@ -96,6 +96,11 @@ spec:
         - name: metrics
           containerPort: {{ include "kube-scheduler.port" . }}
           protocol: TCP
+        {{- if .Values.kubeMaxPDVols }}
+        env:
+        - name: KUBE_MAX_PD_VOLS
+          value: {{ .Values.kubeMaxPDVols | quote }}
+        {{- end }}
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         {{- if .Values.resources }}

diff --git a/charts/seed-controlplane/charts/kube-scheduler/values.yaml b/charts/seed-controlplane/charts/kube-scheduler/values.yaml
@@ -13,3 +13,4 @@ resources:
   limits:
     cpu: 400m
     memory: 512Mi
+#kubeMaxPDVols: "30"
diff --git a/example/90-shoot.yaml b/example/90-shoot.yaml
@@ -148,6 +148,7 @@ spec:
   # kubeScheduler:
   #   featureGates:
   #     SomeKubernetesFeature: true
+  #   kubeMaxPDVols: "30" # https://kubernetes.io/docs/concepts/storage/storage-limits/#custom-limits
   # kubeProxy:
   #   featureGates:
   #     SomeKubernetesFeature: true

diff --git a/hack/api-reference/core.md b/hack/api-reference/core.md
@@ -3903,6 +3903,21 @@ KubernetesConfig
 </p>
 </td>
 </tr>
+<tr>
+<td>
+<code>kubeMaxPDVols</code></br>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>KubeMaxPDVols allows to configure the <code>KUBE_MAX_PD_VOLS</code> environment variable for the kube-scheduler.
+Please find more information here: <a href="https://kubernetes.io/docs/concepts/storage/storage-limits/#custom-limits">https://kubernetes.io/docs/concepts/storage/storage-limits/#custom-limits</a>
+Note that using this field is considered alpha-/experimental-level and is on your own risk. You should be aware
+of all the side-effects and consequences when changing it.</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="core.gardener.cloud/v1beta1.KubeletConfig">KubeletConfig

diff --git a/pkg/apis/core/types_shoot.go b/pkg/apis/core/types_shoot.go
@@ -445,6 +445,11 @@ const (
 // KubeSchedulerConfig contains configuration settings for the kube-scheduler.
 type KubeSchedulerConfig struct {
 	KubernetesConfig
+	// KubeMaxPDVols allows to configure the `KUBE_MAX_PD_VOLS` environment variable for the kube-scheduler.
+	// Please find more information here: https://kubernetes.io/docs/concepts/storage/storage-limits/#custom-limits
+	// Note that using this field is considered alpha-/experimental-level and is on your own risk. You should be aware
+	// of all the side-effects and consequences when changing it.
+	KubeMaxPDVols *string
 }
 
 // KubeProxyConfig contains configuration settings for the kube-proxy.

diff --git a/pkg/apis/core/v1alpha1/generated.pb.go b/pkg/apis/core/v1alpha1/generated.pb.go
diff --git a/pkg/apis/core/v1alpha1/generated.proto b/pkg/apis/core/v1alpha1/generated.proto
diff --git a/pkg/apis/core/v1alpha1/types_shoot.go b/pkg/apis/core/v1alpha1/types_shoot.go
@@ -541,6 +541,12 @@ const (
 // KubeSchedulerConfig contains configuration settings for the kube-scheduler.
 type KubeSchedulerConfig struct {
 	KubernetesConfig `json:",inline" protobuf:"bytes,1,opt,name=kubernetesConfig"`
+	// KubeMaxPDVols allows to configure the `KUBE_MAX_PD_VOLS` environment variable for the kube-scheduler.
+	// Please find more information here: https://kubernetes.io/docs/concepts/storage/storage-limits/#custom-limits
+	// Note that using this field is considered alpha-/experimental-level and is on your own risk. You should be aware
+	// of all the side-effects and consequences when changing it.
+	// +optional
+	KubeMaxPDVols *string `json:"kubeMaxPDVols,omitempty" protobuf:"bytes,2,opt,name=kubeMaxPDVols"`
 }
 
 // KubeProxyConfig contains configuration settings for the kube-proxy.

diff --git a/pkg/apis/core/v1alpha1/zz_generated.conversion.go b/pkg/apis/core/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go