Merge branch 'main' into chore/karpenter-support-prior-1.30

topfreegames · Oct 28, 2024 · 90b4cd7 · 90b4cd7
2 parents 04162e4 + 4b90fa0
commit 90b4cd7
Show file tree

Hide file tree

Showing 8 changed files with 796 additions and 1,072 deletions.
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_kopscontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_kopscontrolplanes.yaml
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_kopsmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_kopsmachinepools.yaml
@@ -1453,6 +1453,15 @@ spec:
                         description: Address of containerd's GRPC server (default
                           "/run/containerd/containerd.sock").
                         type: string
+                      configAdditions:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          x-kubernetes-int-or-string: true
+                        description: ConfigAdditions adds additional config entries
+                          to the generated config file.
+                        type: object
                       configOverride:
                         description: ConfigOverride is the complete containerd config
                           file provided by the user.
@@ -1461,6 +1470,21 @@ spec:
                         description: LogLevel controls the logging details [trace,
                           debug, info, warn, error, fatal, panic] (default "info").
                         type: string
+                      nri:
+                        description: NRI configures the Node Resource Interface.
+                        properties:
+                          enabled:
+                            description: Enable NRI support in containerd
+                            type: boolean
+                          pluginRegistrationTimeout:
+                            description: PluginRegistrationTimeout is the timeout
+                              for plugin registration
+                            type: string
+                          pluginRequestTimeout:
+                            description: PluginRequestTimeout is the timeout for a
+                              plugin to handle a request
+                            type: string
+                        type: object
                       nvidiaGPU:
                         description: NvidiaGPU configures the Nvidia GPU runtime.
                         properties:
@@ -1663,7 +1687,7 @@ spec:
                                 added to the hook
                               type: object
                             image:
-                              description: Image is the docker image
+                              description: Image is the container image.
                               type: string
                           type: object
                         manifest:
@@ -1823,10 +1847,6 @@ spec:
                         description: CpuManagerPolicy allows for changing the default
                           policy of None to static
                         type: string
-                      dockerDisableSharedPID:
-                        description: DockerDisableSharedPID uses a shared PID namespace
-                          for containers in a pod.
-                        type: boolean
                       enableCadvisorJsonEndpoints:
                         description: EnableCadvisorJsonEndpoints enables cAdvisor
                           json `/spec` and `/stats/*` endpoints. Defaults to False.
@@ -1936,6 +1956,16 @@ spec:
                           collect to.
                         format: int32
                         type: integer
+                      imageMaximumGCAge:
+                        description: |-
+                          imageMaximumGCAge is the maximum age an image can be unused before it is garbage collected.
+                          The default of this field is "0s", which disables this field--meaning images won't be garbage
+                          collected based on being unused for too long. Default: "0s" (disabled)
+                        type: string
+                      imageMinimumGCAge:
+                        description: 'imageMinimumGCAge is the minimum age for an
+                          unused image before it is garbage collected. Default: "2m"'
+                        type: string
                       imagePullProgressDeadline:
                         description: |-
                           ImagePullProgressDeadline is the timeout for image pulls
@@ -2101,11 +2131,8 @@ spec:
                           seccomp profiles.
                         type: string
                       serializeImagePulls:
-                        description: |-
-                          // SerializeImagePulls when enabled, tells the Kubelet to pull images one
-                          // at a time. We recommend *not* changing the default value on nodes that
-                          // run docker daemon with version  < 1.9 or an Aufs storage backend.
-                          // Issue #10959 has more details.
+                        description: SerializeImagePulls when enabled, tells the Kubelet
+                          to pull images one at a time.
                         type: boolean
                       shutdownGracePeriod:
                         description: |-