Add support for MemorySwap

k8s/crds/kops.k8s.io_clusters.yaml

@@ -3791,6 +3791,17 @@ spec:
                       Kubelet.
                     format: int32
                     type: integer
+                  memorySwap:
+                    description: MemorySwap defines the memory swap behavior
+                    type: string
+                  memorySwapConfiguration:
+                    description: MemorySwapConfiguration holds the memory swap configuration
+                      for the kubelet
+                    properties:
+                      swapBehavior:
+                        description: SwapBehavior can be "" or "UnlimitedSwap"
+                        type: string
+                    type: object
                   networkPluginMTU:
                     description: NetworkPluginMTU is the MTU to be passed to the network
                       plugin, and overrides the default MTU for cases where it cannot
@@ -4220,6 +4231,17 @@ spec:
                       Kubelet.
                     format: int32
                     type: integer
+                  memorySwap:
+                    description: MemorySwap defines the memory swap behavior
+                    type: string
+                  memorySwapConfiguration:
+                    description: MemorySwapConfiguration holds the memory swap configuration
+                      for the kubelet
+                    properties:
+                      swapBehavior:
+                        description: SwapBehavior can be "" or "UnlimitedSwap"
+                        type: string
+                    type: object
                   networkPluginMTU:
                     description: NetworkPluginMTU is the MTU to be passed to the network
                       plugin, and overrides the default MTU for cases where it cannot

k8s/crds/kops.k8s.io_instancegroups.yaml

@@ -618,6 +618,17 @@ spec:
                       Kubelet.
                     format: int32
                     type: integer
+                  memorySwap:
+                    description: MemorySwap defines the memory swap behavior
+                    type: string
+                  memorySwapConfiguration:
+                    description: MemorySwapConfiguration holds the memory swap configuration
+                      for the kubelet
+                    properties:
+                      swapBehavior:
+                        description: SwapBehavior can be "" or "UnlimitedSwap"
+                        type: string
+                    type: object
                   networkPluginMTU:
                     description: NetworkPluginMTU is the MTU to be passed to the network
                       plugin, and overrides the default MTU for cases where it cannot

pkg/apis/kops/componentconfig.go

@@ -225,13 +225,16 @@ type KubeletConfigSpec struct {
 	EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
 	// PodPidsLimit is the maximum number of pids in any pod.
 	PodPidsLimit *int64 `json:"podPidsLimit,omitempty" flag:"pod-max-pids"`
-
 	// ShutdownGracePeriod specifies the total duration that the node should delay the shutdown by.
 	// Default: 30s
 	ShutdownGracePeriod *metav1.Duration `json:"shutdownGracePeriod,omitempty"`
 	// ShutdownGracePeriodCriticalPods specifies the duration used to terminate critical pods during a node shutdown.
 	// Default: 10s
 	ShutdownGracePeriodCriticalPods *metav1.Duration `json:"shutdownGracePeriodCriticalPods,omitempty"`
+	// MemorySwapConfiguration holds the memory swap configuration for the kubelet
+	MemorySwapConfiguration *MemorySwapConfiguration `json:"memorySwapConfiguration,omitempty"`
+	// MemorySwap defines the memory swap behavior
+	MemorySwap *string `json:"memorySwap,omitempty"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy
@@ -1096,13 +1099,19 @@ type LoadBalancerControllerSpec struct {
 	// Default: false
 	EnableWAF bool `json:"enableWAF,omitempty"`
 	// EnableWAFv2 specifies whether the controller can use WAFs (V2).
+
 	// Default: false
 	EnableWAFv2 bool `json:"enableWAFv2,omitempty"`
 	// EnableShield specifies whether the controller can enable Shield Advanced.
 	// Default: false
 	EnableShield bool `json:"enableShield,omitempty"`
 }
 
+type MemorySwapConfiguration struct {
+	// SwapBehavior can be "" or "UnlimitedSwap"
+	SwapBehavior *string `json:"swapBehavior,omitempty"`
+}
+
 // HasAdmissionController checks if a specific admission controller is enabled
 func (c *KubeAPIServerConfig) HasAdmissionController(name string) bool {
 	for _, x := range c.AdmissionControl {

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -225,13 +225,16 @@ type KubeletConfigSpec struct {
 	EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
 	// PodPidsLimit is the maximum number of pids in any pod.
 	PodPidsLimit *int64 `json:"podPidsLimit,omitempty" flag:"pod-max-pids"`
-
 	// ShutdownGracePeriod specifies the total duration that the node should delay the shutdown by.
 	// Default: 30s
 	ShutdownGracePeriod *metav1.Duration `json:"shutdownGracePeriod,omitempty"`
 	// ShutdownGracePeriodCriticalPods specifies the duration used to terminate critical pods during a node shutdown.
 	// Default: 10s
 	ShutdownGracePeriodCriticalPods *metav1.Duration `json:"shutdownGracePeriodCriticalPods,omitempty"`
+	// MemorySwapConfiguration holds the memory swap configuration for the kubelet
+	MemorySwapConfiguration *MemorySwapConfiguration `json:"memorySwapConfiguration,omitempty"`
+	// MemorySwap defines the memory swap behavior
+	MemorySwap *string `json:"memorySwap,omitempty"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy
@@ -1166,6 +1169,11 @@ type LoadBalancerControllerSpec struct {
 	EnableShield bool `json:"enableShield,omitempty"`
 }
 
+type MemorySwapConfiguration struct {
+	// SwapBehavior can be "" or "UnlimitedSwap"
+	SwapBehavior *string `json:"swapBehavior,omitempty"`
+}
+
 // HasAdmissionController checks if a specific admission controller is enabled
 func (c *KubeAPIServerConfig) HasAdmissionController(name string) bool {
 	for _, x := range c.AdmissionControl {

pkg/apis/kops/v1alpha3/componentconfig.go

@@ -223,13 +223,16 @@ type KubeletConfigSpec struct {
 	EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
 	// PodPidsLimit is the maximum number of pids in any pod.
 	PodPidsLimit *int64 `json:"podPidsLimit,omitempty" flag:"pod-max-pids"`
-
 	// ShutdownGracePeriod specifies the total duration that the node should delay the shutdown by.
 	// Default: 30s
 	ShutdownGracePeriod *metav1.Duration `json:"shutdownGracePeriod,omitempty"`
 	// ShutdownGracePeriodCriticalPods specifies the duration used to terminate critical pods during a node shutdown.
 	// Default: 10s
 	ShutdownGracePeriodCriticalPods *metav1.Duration `json:"shutdownGracePeriodCriticalPods,omitempty"`
+	// MemorySwapConfiguration holds the memory swap configuration for the kubelet
+	MemorySwapConfiguration *MemorySwapConfiguration `json:"memorySwapConfiguration,omitempty"`
+	// MemorySwap defines the memory swap behavior
+	MemorySwap *string `json:"memorySwap,omitempty"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy
@@ -1095,3 +1098,8 @@ type LoadBalancerControllerSpec struct {
 	// Default: false
 	EnableShield bool `json:"enableShield,omitempty"`
 }
+
+type MemorySwapConfiguration struct {
+	// SwapBehavior can be "" or "UnlimitedSwap"
+	SwapBehavior *string `json:"swapBehavior,omitempty"`
+}