Skip to content

Commit

Permalink
machineconfiguration: add dropInDir details for KubeletConfigSpec
Browse files Browse the repository at this point in the history 
Signed-off-by: Sohan Kunkerkar <[email protected]>
  • Loading branch information
@sohankunkerkar
sohankunkerkar committed Jan 16, 2025
1 parent 52377f0 commit fdab88a
Show file tree
Hide file tree
Showing 14 changed files with 76 additions and 0 deletions.
1 change: 1 addition & 0 deletions features.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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> |
Expand Down
8 changes: 8 additions & 0 deletions features/features.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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").
Expand Down
10 changes: 10 additions & 0 deletions machineconfiguration/v1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions ...iguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions machineconfiguration/v1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions ...turegated-crd-manifests/kubeletconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions machineconfiguration/v1/zz_generated.swagger_doc_generated.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions payload-manifests/crds/0000_80_machine-config_01_kubeletconfigs.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
{
"name": "KMSEncryptionProvider"
},
{
"name": "KubeletConfigDropInDir"
},
{
"name": "MachineAPIMigration"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@
{
"name": "KMSv1"
},
{
"name": "KubeletConfigDropInDir"
},
{
"name": "MachineAPIProviderOpenStack"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@
{
"name": "KMSv1"
},
{
"name": "KubeletConfigDropInDir"
},
{
"name": "MachineAPIProviderOpenStack"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@
{
"name": "KMSEncryptionProvider"
},
{
"name": "KubeletConfigDropInDir"
},
{
"name": "MachineAPIMigration"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@
{
"name": "KMSv1"
},
{
"name": "KubeletConfigDropInDir"
},
{
"name": "MachineAPIProviderOpenStack"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@
{
"name": "KMSv1"
},
{
"name": "KubeletConfigDropInDir"
},
{
"name": "MachineAPIProviderOpenStack"
},
Expand Down

0 comments on commit fdab88a

Please sign in to comment.