NO-ISSUE: Fixes KubeletConfig API doc, adds tests and kubebuilder validation

machineconfiguration/v1/tests/kubeletconfigs.machineconfiguration.openshift.io/KubeletConfigSpec.yaml

@@ -0,0 +1,89 @@
+apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
+name: "KubeletConfig"
+crdName: kubeletconfigs.machineconfiguration.openshift.io
+tests:
+  onCreate:
+    # LogLevel Boundary Tests
+    - name: Should be able to set logLevel to 0 (minimum)
+      initial: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 0
+      expected: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 0
+    - name: Should be able to set logLevel to 10 (maximum)
+      initial: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 10
+      expected: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 10
+    - name: Should reject logLevel less than 0
+      initial: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: -1
+      expectedError: "Invalid value"
+    - name: Should reject logLevel greater than 10
+      initial: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 11
+      expectedError: "Invalid value"
+
+  onUpdate:
+    # Ratcheting tests - ensure existing objects with previously valid values can be updated
+    - name: Should allow updating other fields with a previously valid logLevel outside current range
+      initialCRDPatches:
+        - op: remove
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/logLevel/maximum
+        - op: remove
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/logLevel/minimum
+      initial: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 15
+      updated: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 15
+          autoSizingReserved: true
+      expected: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 15
+          autoSizingReserved: true
+    - name: Should allow migrating from invalid logLevel to valid value
+      initialCRDPatches:
+        - op: remove
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/logLevel/maximum
+        - op: remove
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/logLevel/minimum
+      initial: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 15
+      updated: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 5
+      expected: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: KubeletConfig
+        spec:
+          logLevel: 5

machineconfiguration/v1/types.go

@@ -737,27 +737,40 @@ type KubeletConfig struct {
 	Status KubeletConfigStatus `json:"status"`
 }
 
-// KubeletConfigSpec defines the desired state of KubeletConfig
+// KubeletConfigSpec configures the kubelet running on cluster nodes.
 type KubeletConfigSpec struct {
+	// autoSizingReserved controls whether system-reserved CPU and memory are automatically
+	// calculated based on each node's installed capacity. When set to true, this prevents node failure
+	// from resource starvation of system components (kubelet, CRI-O) without manual configuration.
+	// When omitted, this means the user has no opinion and the platform is left to choose a reasonable default,
+	// which is subject to change over time. The current default is true for worker nodes and false for control plane nodes.
+	// When set to false, automatic resource reservation is disabled and manual settings must be configured.
 	// +optional
 	AutoSizingReserved *bool `json:"autoSizingReserved,omitempty"`
+	// logLevel sets the kubelet log verbosity, controlling the amount of detail in kubelet logs.
+	// Valid values range from 0 (minimal logging) to 10 (maximum verbosity with trace-level detail).
+	// Higher log levels may impact node performance. When omitted, the platform chooses a reasonable default,
+	// which is subject to change over time. The current default is 2 (standard informational logging).
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:validation:Maximum=10
 	// +optional
 	LogLevel *int32 `json:"logLevel,omitempty"`
 
-	// machineConfigPoolSelector selects which pools the KubeletConfig shoud apply to.
-	// A nil selector will result in no pools being selected.
+	// machineConfigPoolSelector selects which pools the KubeletConfig should apply to.
+	// When omitted or set to an empty selector {}, no pools are selected, which is equivalent
+	// to not matching any MachineConfigPool.
 	// +optional
 	MachineConfigPoolSelector *metav1.LabelSelector `json:"machineConfigPoolSelector,omitempty"`
-	// kubeletConfig fields are defined in kubernetes upstream. Please refer to the types defined in the version/commit used by
-	// OpenShift of the upstream kubernetes. It's important to note that, since the fields of the kubelet configuration are directly fetched from
-	// upstream the validation of those values is handled directly by the kubelet. Please refer to the upstream version of the relevant kubernetes
-	// for the valid values of these fields. Invalid values of the kubelet configuration fields may render cluster nodes unusable.
+	// kubeletConfig contains upstream Kubernetes kubelet configuration fields.
+	// Values are validated by the kubelet itself. Invalid values may render nodes unusable.
+	// Refer to OpenShift documentation for the Kubernetes version corresponding to your
+	// OpenShift release to find valid kubelet configuration options.
 	// +optional
 	KubeletConfig *runtime.RawExtension `json:"kubeletConfig,omitempty"`
 
-	// If unset, the default is based on the apiservers.config.openshift.io/cluster resource.
-	// Note that only Old and Intermediate profiles are currently supported, and
-	// the maximum available minTLSVersion is VersionTLS12.
+	// tlsSecurityProfile configures TLS settings for the kubelet.
+	// When omitted, the TLS configuration defaults to the value from apiservers.config.openshift.io/cluster.
+	// When specified, the type field can be set to either "Old", "Intermediate", "Modern", "Custom" or omitted for backward compatibility.
 	// +optional
 	TLSSecurityProfile *configv1.TLSSecurityProfile `json:"tlsSecurityProfile,omitempty"`
 }

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml

@@ -47,22 +47,37 @@ spec:
             description: spec contains the desired kubelet configuration.
             properties:
               autoSizingReserved:
+                description: |-
+                  autoSizingReserved controls whether system-reserved CPU and memory are automatically
+                  calculated based on each node's installed capacity. When set to true, this prevents node failure
+                  from resource starvation of system components (kubelet, CRI-O) without manual configuration.
+                  When omitted, this means the user has no opinion and the platform is left to choose a reasonable default,
+                  which is subject to change over time. The current default is true for worker nodes and false for control plane nodes.
+                  When set to false, automatic resource reservation is disabled and manual settings must be configured.
                 type: boolean
               kubeletConfig:
                 description: |-
-                  kubeletConfig fields are defined in kubernetes upstream. Please refer to the types defined in the version/commit used by
-                  OpenShift of the upstream kubernetes. It's important to note that, since the fields of the kubelet configuration are directly fetched from
-                  upstream the validation of those values is handled directly by the kubelet. Please refer to the upstream version of the relevant kubernetes
-                  for the valid values of these fields. Invalid values of the kubelet configuration fields may render cluster nodes unusable.
+                  kubeletConfig contains upstream Kubernetes kubelet configuration fields.
+                  Values are validated by the kubelet itself. Invalid values may render nodes unusable.
+                  Refer to OpenShift documentation for the Kubernetes version corresponding to your
+                  OpenShift release to find valid kubelet configuration options.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
               logLevel:
+                description: |-
+                  logLevel sets the kubelet log verbosity, controlling the amount of detail in kubelet logs.
+                  Valid values range from 0 (minimal logging) to 10 (maximum verbosity with trace-level detail).
+                  Higher log levels may impact node performance. When omitted, the platform chooses a reasonable default,
+                  which is subject to change over time. The current default is 2 (standard informational logging).
                 format: int32
+                maximum: 10
+                minimum: 0
                 type: integer
               machineConfigPoolSelector:
                 description: |-
-                  machineConfigPoolSelector selects which pools the KubeletConfig shoud apply to.
-                  A nil selector will result in no pools being selected.
+                  machineConfigPoolSelector selects which pools the KubeletConfig should apply to.
+                  When omitted or set to an empty selector {}, no pools are selected, which is equivalent
+                  to not matching any MachineConfigPool.
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -109,9 +124,9 @@ spec:
                 x-kubernetes-map-type: atomic
               tlsSecurityProfile:
                 description: |-
-                  If unset, the default is based on the apiservers.config.openshift.io/cluster resource.
-                  Note that only Old and Intermediate profiles are currently supported, and
-                  the maximum available minTLSVersion is VersionTLS12.
+                  tlsSecurityProfile configures TLS settings for the kubelet.
+                  When omitted, the TLS configuration defaults to the value from apiservers.config.openshift.io/cluster.
+                  When specified, the type field can be set to either "Old", "Intermediate", "Modern", "Custom" or omitted for backward compatibility.
                 properties:
                   custom:
                     description: |-

machineconfiguration/v1/zz_generated.featuregated-crd-manifests/kubeletconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml

@@ -48,22 +48,37 @@ spec:
             description: spec contains the desired kubelet configuration.
             properties:
               autoSizingReserved:
+                description: |-
+                  autoSizingReserved controls whether system-reserved CPU and memory are automatically
+                  calculated based on each node's installed capacity. When set to true, this prevents node failure
+                  from resource starvation of system components (kubelet, CRI-O) without manual configuration.
+                  When omitted, this means the user has no opinion and the platform is left to choose a reasonable default,
+                  which is subject to change over time. The current default is true for worker nodes and false for control plane nodes.
+                  When set to false, automatic resource reservation is disabled and manual settings must be configured.
                 type: boolean
               kubeletConfig:
                 description: |-
-                  kubeletConfig fields are defined in kubernetes upstream. Please refer to the types defined in the version/commit used by
-                  OpenShift of the upstream kubernetes. It's important to note that, since the fields of the kubelet configuration are directly fetched from
-                  upstream the validation of those values is handled directly by the kubelet. Please refer to the upstream version of the relevant kubernetes
-                  for the valid values of these fields. Invalid values of the kubelet configuration fields may render cluster nodes unusable.
+                  kubeletConfig contains upstream Kubernetes kubelet configuration fields.
+                  Values are validated by the kubelet itself. Invalid values may render nodes unusable.
+                  Refer to OpenShift documentation for the Kubernetes version corresponding to your
+                  OpenShift release to find valid kubelet configuration options.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
               logLevel:
+                description: |-
+                  logLevel sets the kubelet log verbosity, controlling the amount of detail in kubelet logs.
+                  Valid values range from 0 (minimal logging) to 10 (maximum verbosity with trace-level detail).
+                  Higher log levels may impact node performance. When omitted, the platform chooses a reasonable default,
+                  which is subject to change over time. The current default is 2 (standard informational logging).
                 format: int32
+                maximum: 10
+                minimum: 0
                 type: integer
               machineConfigPoolSelector:
                 description: |-
-                  machineConfigPoolSelector selects which pools the KubeletConfig shoud apply to.
-                  A nil selector will result in no pools being selected.
+                  machineConfigPoolSelector selects which pools the KubeletConfig should apply to.
+                  When omitted or set to an empty selector {}, no pools are selected, which is equivalent
+                  to not matching any MachineConfigPool.
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -110,9 +125,9 @@ spec:
                 x-kubernetes-map-type: atomic
               tlsSecurityProfile:
                 description: |-
-                  If unset, the default is based on the apiservers.config.openshift.io/cluster resource.
-                  Note that only Old and Intermediate profiles are currently supported, and
-                  the maximum available minTLSVersion is VersionTLS12.
+                  tlsSecurityProfile configures TLS settings for the kubelet.
+                  When omitted, the TLS configuration defaults to the value from apiservers.config.openshift.io/cluster.
+                  When specified, the type field can be set to either "Old", "Intermediate", "Modern", "Custom" or omitted for backward compatibility.
                 properties:
                   custom:
                     description: |-