machineconfiguration: add dropInDir details for KubeletConfigSpec

sohankunkerkar · sohankunkerkar · commit fdab88ada25d · 2025-01-16T10:37:37.000-05:00
Signed-off-by: Sohan Kunkerkar &lt;sohank2602@gmail.com&gt;
diff --git a/features.md b/features.md
@@ -28,6 +28,7 @@
 | InsightsOnDemandDataGather| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | InsightsRuntimeExtractor| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | KMSEncryptionProvider| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| KubeletConfigDropInDir| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MachineAPIProviderOpenStack| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MachineConfigNodes| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MaxUnavailableStatefulSet| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -695,6 +695,14 @@ var (
 						enhancementPR("https://github.com/openshift/enhancements/pull/1697").
 						mustRegister()
 
+	FeatureGateKubeletConfigDropInDir = newFeatureGate("KubeletConfigDropInDir").
+						reportProblemsToJiraComponent("Node").
+						contactPerson("sohankunkerkar").
+						productScope(ocpSpecific).
+						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						enhancementPR("https://github.com/kubernetes/enhancements/issues/3983").
+						mustRegister()
+
 	FeatureGateNutanixMultiSubnets = newFeatureGate("NutanixMultiSubnets").
 					reportProblemsToJiraComponent("Cloud Compute / Nutanix Provider").
 					contactPerson("yanhli").
diff --git a/machineconfiguration/v1/types.go b/machineconfiguration/v1/types.go
@@ -709,6 +709,16 @@ type KubeletConfigSpec struct {
 	// A nil selector will result in no pools being selected.
 	// +optional
 	MachineConfigPoolSelector *metav1.LabelSelector `json:"machineConfigPoolSelector,omitempty"`
+
+	// dropInConfigDirectory allows users to define a directory for Kubelet's drop-in configuration.
+	// This enables incremental configuration updates without modifying the main KubeletConfig.
+	// +optional
+	DropInConfigDirectory *string `json:"dropInConfigDirectory,omitempty"`
+
+	// dropInConfigFile defines a specific configuration file within the drop-in directory.
+	// +optional
+	DropInConfigFile *string `json:"dropInConfigFile,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
diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml
@@ -48,6 +48,15 @@ spec:
             properties:
               autoSizingReserved:
                 type: boolean
+              dropInConfigDirectory:
+                description: |-
+                  dropInConfigDirectory allows users to define a directory for Kubelet's drop-in configuration.
+                  This enables incremental configuration updates without modifying the main KubeletConfig.
+                type: string
+              dropInConfigFile:
+                description: dropInConfigFile defines a specific configuration file
+                  within the drop-in directory.
+                type: string
               kubeletConfig:
                 description: |-
                   kubeletConfig fields are defined in kubernetes upstream. Please refer to the types defined in the version/commit used by
diff --git a/machineconfiguration/v1/zz_generated.deepcopy.go b/machineconfiguration/v1/zz_generated.deepcopy.go
diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/kubeletconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/kubeletconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml
@@ -49,6 +49,15 @@ spec:
             properties:
               autoSizingReserved:
                 type: boolean
+              dropInConfigDirectory:
+                description: |-
+                  dropInConfigDirectory allows users to define a directory for Kubelet's drop-in configuration.
+                  This enables incremental configuration updates without modifying the main KubeletConfig.
+                type: string
+              dropInConfigFile:
+                description: dropInConfigFile defines a specific configuration file
+                  within the drop-in directory.
+                type: string
               kubeletConfig:
                 description: |-
                   kubeletConfig fields are defined in kubernetes upstream. Please refer to the types defined in the version/commit used by
diff --git a/machineconfiguration/v1/zz_generated.swagger_doc_generated.go b/machineconfiguration/v1/zz_generated.swagger_doc_generated.go
diff --git a/payload-manifests/crds/0000_80_machine-config_01_kubeletconfigs.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_kubeletconfigs.crd.yaml
@@ -48,6 +48,15 @@ spec:
             properties:
               autoSizingReserved:
                 type: boolean
+              dropInConfigDirectory:
+                description: |-
+                  dropInConfigDirectory allows users to define a directory for Kubelet's drop-in configuration.
+                  This enables incremental configuration updates without modifying the main KubeletConfig.
+                type: string
+              dropInConfigFile:
+                description: dropInConfigFile defines a specific configuration file
+                  within the drop-in directory.
+                type: string
               kubeletConfig:
                 description: |-
                   kubeletConfig fields are defined in kubernetes upstream. Please refer to the types defined in the version/commit used by
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -85,6 +85,9 @@
                     {
                         "name": "KMSEncryptionProvider"
                     },
+                    {
+                        "name": "KubeletConfigDropInDir"
+                    },
                     {
                         "name": "MachineAPIMigration"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -146,6 +146,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KubeletConfigDropInDir"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -146,6 +146,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KubeletConfigDropInDir"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -88,6 +88,9 @@
                     {
                         "name": "KMSEncryptionProvider"
                     },
+                    {
+                        "name": "KubeletConfigDropInDir"
+                    },
                     {
                         "name": "MachineAPIMigration"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -143,6 +143,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KubeletConfigDropInDir"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -143,6 +143,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "KubeletConfigDropInDir"
+                    },
                     {
                         "name": "MachineAPIProviderOpenStack"
                     },

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@`
`85`	`85`	`{`
`86`	`86`	`"name": "KMSEncryptionProvider"`
`87`	`87`	`},`
	`88`	`+ {`
	`89`	`+ "name": "KubeletConfigDropInDir"`
	`90`	`+ },`
`88`	`91`	`{`
`89`	`92`	`"name": "MachineAPIMigration"`
`90`	`93`	`},`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,9 @@`
`146`	`146`	`{`
`147`	`147`	`"name": "KMSv1"`
`148`	`148`	`},`
	`149`	`+ {`
	`150`	`+ "name": "KubeletConfigDropInDir"`
	`151`	`+ },`
`149`	`152`	`{`
`150`	`153`	`"name": "MachineAPIProviderOpenStack"`
`151`	`154`	`},`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@`
`88`	`88`	`{`
`89`	`89`	`"name": "KMSEncryptionProvider"`
`90`	`90`	`},`
	`91`	`+ {`
	`92`	`+ "name": "KubeletConfigDropInDir"`
	`93`	`+ },`
`91`	`94`	`{`
`92`	`95`	`"name": "MachineAPIMigration"`
`93`	`96`	`},`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,9 @@`
`143`	`143`	`{`
`144`	`144`	`"name": "KMSv1"`
`145`	`145`	`},`
	`146`	`+ {`
	`147`	`+ "name": "KubeletConfigDropInDir"`
	`148`	`+ },`
`146`	`149`	`{`
`147`	`150`	`"name": "MachineAPIProviderOpenStack"`
`148`	`151`	`},`