Skip to content

Commit f4eee44

Browse files
faiqfaiq
committed
fix: removes local store options which isn't supported by capa
1 parent 40aa153 commit f4eee44

File tree

6 files changed

+0
-172
lines changed

6 files changed

+0
-172
lines changed

‎bootstrap/eks/api/v1beta2/nodeadmconfig_types.go‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ type NodeadmConfigSpec struct {
1717
// +optional
1818
Containerd *ContainerdOptions `json:"containerd,omitempty"`
1919

20-
// Instance contains options for the node's operating system and devices.
21-
// +optional
22-
Instance *InstanceOptions `json:"instance,omitempty"`
23-
2420
// FeatureGates holds key-value pairs to enable or disable application features.
2521
// +optional
2622
FeatureGates map[Feature]bool `json:"featureGates,omitempty"`
@@ -74,29 +70,6 @@ type ContainerdOptions struct {
7470
BaseRuntimeSpec *runtime.RawExtension `json:"baseRuntimeSpec,omitempty"`
7571
}
7672

77-
// InstanceOptions determines how the node's operating system and devices are configured.
78-
type InstanceOptions struct {
79-
// LocalStorage contains options for configuring EC2 instance stores.
80-
// +optional
81-
LocalStorage *LocalStorageOptions `json:"localStorage,omitempty"`
82-
}
83-
84-
// LocalStorageOptions control how EC2 instance stores are used when available.
85-
type LocalStorageOptions struct {
86-
// Strategy specifies how to handle an instance's local storage devices.
87-
Strategy LocalStorageStrategy `json:"strategy"`
88-
89-
// MountPath is the path where the filesystem will be mounted.
90-
// Defaults to "/mnt/k8s-disks/".
91-
// +optional
92-
MountPath string `json:"mountPath,omitempty"`
93-
94-
// DisabledMounts is a list of directories that will not be mounted to LocalStorage.
95-
// By default, all mounts are enabled.
96-
// +optional
97-
DisabledMounts []DisabledMount `json:"disabledMounts,omitempty"`
98-
}
99-
10073
// Feature specifies which feature gate should be toggled.
10174
// +kubebuilder:validation:Enum=InstanceIdNodeName;FastImagePull
10275
type Feature string
@@ -108,30 +81,6 @@ const (
10881
FeatureFastImagePull Feature = "FastImagePull"
10982
)
11083

111-
// LocalStorageStrategy specifies how to handle an instance's local storage devices.
112-
// +kubebuilder:validation:Enum=RAID0;RAID10;Mount
113-
type LocalStorageStrategy string
114-
115-
const (
116-
// RAID0Strategy is a local storage strategy for EKS nodes
117-
RAID0Strategy LocalStorageStrategy = "RAID0"
118-
// RAID10Strategy is a local storage strategy for EKS nodes
119-
RAID10Strategy LocalStorageStrategy = "RAID10"
120-
// MountStrategy is a local storage strategy for EKS nodes
121-
MountStrategy LocalStorageStrategy = "Mount"
122-
)
123-
124-
// DisabledMount specifies a directory that should not be mounted onto local storage.
125-
// +kubebuilder:validation:Enum=Containerd;PodLogs
126-
type DisabledMount string
127-
128-
const (
129-
// DisabledMountContainerd refers to /var/lib/containerd
130-
DisabledMountContainerd DisabledMount = "Containerd"
131-
// DisabledMountPodLogs refers to /var/log/pods
132-
DisabledMountPodLogs DisabledMount = "PodLogs"
133-
)
134-
13584
// GetConditions returns the observations of the operational state of the NodeadmConfig resource.
13685
func (r *NodeadmConfig) GetConditions() clusterv1.Conditions {
13786
return r.Status.Conditions

‎bootstrap/eks/api/v1beta2/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/eks/controllers/nodeadmconfig_controller.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ func (r *NodeadmConfigReconciler) joinWorker(ctx context.Context, cluster *clust
202202
nodeInput := &userdata.NodeadmInput{
203203
// AWSManagedControlPlane webhooks default and validate EKSClusterName
204204
ClusterName: controlPlane.Spec.EKSClusterName,
205-
Instance: config.Spec.Instance,
206205
PreBootstrapCommands: config.Spec.PreBootstrapCommands,
207206
Users: config.Spec.Users,
208207
NTP: config.Spec.NTP,

‎bootstrap/eks/internal/userdata/nodeadm.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ type NodeadmInput struct {
143143
ContainerdConfig string
144144
ContainerdBaseRuntimeSpec *runtime.RawExtension
145145
FeatureGates map[eksbootstrapv1.Feature]bool
146-
Instance *eksbootstrapv1.InstanceOptions
147146

148147
PreBootstrapCommands []string
149148
Files []eksbootstrapv1.File

‎config/crd/bases/bootstrap.cluster.x-k8s.io_nodeadmconfigs.yaml‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -192,43 +192,6 @@ spec:
192192
- path
193193
type: object
194194
type: array
195-
instance:
196-
description: Instance contains options for the node's operating system
197-
and devices.
198-
properties:
199-
localStorage:
200-
description: LocalStorage contains options for configuring EC2
201-
instance stores.
202-
properties:
203-
disabledMounts:
204-
description: |-
205-
DisabledMounts is a list of directories that will not be mounted to LocalStorage.
206-
By default, all mounts are enabled.
207-
items:
208-
description: DisabledMount specifies a directory that should
209-
not be mounted onto local storage.
210-
enum:
211-
- Containerd
212-
- PodLogs
213-
type: string
214-
type: array
215-
mountPath:
216-
description: |-
217-
MountPath is the path where the filesystem will be mounted.
218-
Defaults to "/mnt/k8s-disks/".
219-
type: string
220-
strategy:
221-
description: Strategy specifies how to handle an instance's
222-
local storage devices.
223-
enum:
224-
- RAID0
225-
- RAID10
226-
- Mount
227-
type: string
228-
required:
229-
- strategy
230-
type: object
231-
type: object
232195
kubelet:
233196
description: Kubelet contains options for kubelet.
234197
properties:

‎config/crd/bases/bootstrap.cluster.x-k8s.io_nodeadmconfigtemplates.yaml‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -209,43 +209,6 @@ spec:
209209
- path
210210
type: object
211211
type: array
212-
instance:
213-
description: Instance contains options for the node's operating
214-
system and devices.
215-
properties:
216-
localStorage:
217-
description: LocalStorage contains options for configuring
218-
EC2 instance stores.
219-
properties:
220-
disabledMounts:
221-
description: |-
222-
DisabledMounts is a list of directories that will not be mounted to LocalStorage.
223-
By default, all mounts are enabled.
224-
items:
225-
description: DisabledMount specifies a directory
226-
that should not be mounted onto local storage.
227-
enum:
228-
- Containerd
229-
- PodLogs
230-
type: string
231-
type: array
232-
mountPath:
233-
description: |-
234-
MountPath is the path where the filesystem will be mounted.
235-
Defaults to "/mnt/k8s-disks/".
236-
type: string
237-
strategy:
238-
description: Strategy specifies how to handle an instance's
239-
local storage devices.
240-
enum:
241-
- RAID0
242-
- RAID10
243-
- Mount
244-
type: string
245-
required:
246-
- strategy
247-
type: object
248-
type: object
249212
kubelet:
250213
description: Kubelet contains options for kubelet.
251214
properties:

0 commit comments

Comments
 (0)