TPT-3807: Added DiskEncryption field for LKE Node Pool creation (#917)

* Added DiskEncryption field for LKE Node Pool creation

* Address CoPilot suggestions

* Removed more LA notices

* Update disk_encryption field to be a pointer

Author: ezilber-akamai

instance_disks.go

@@ -18,7 +18,6 @@ type InstanceDisk struct {
 	Created    *time.Time     `json:"-"`
 	Updated    *time.Time     `json:"-"`
 
-	// NOTE: Disk encryption may not currently be available to all users.
 	DiskEncryption InstanceDiskEncryption `json:"disk_encryption"`
 }
 

instances.go

@@ -70,7 +70,6 @@ type Instance struct {
 	Tags            []string                `json:"tags"`
 	PlacementGroup  *InstancePlacementGroup `json:"placement_group"`
 
-	// NOTE: Disk encryption may not currently be available to all users.
 	DiskEncryption InstanceDiskEncryption `json:"disk_encryption"`
 
 	LKEClusterID int      `json:"lke_cluster_id"`

lke_node_pools.go

@@ -77,7 +77,6 @@ type LKENodePool struct {
 	Autoscaler LKENodePoolAutoscaler `json:"autoscaler"`
 	FirewallID *int                  `json:"firewall_id,omitempty"`
 
-	// NOTE: Disk encryption may not currently be available to all users.
 	DiskEncryption InstanceDiskEncryption `json:"disk_encryption,omitempty"`
 
 	// K8sVersion and UpdateStrategy are only for LKE Enterprise to support node pool upgrades.
@@ -103,6 +102,8 @@ type LKENodePoolCreateOptions struct {
 	// It may not currently be available to all users and is under v4beta.
 	K8sVersion     *string                    `json:"k8s_version,omitempty"`
 	UpdateStrategy *LKENodePoolUpdateStrategy `json:"update_strategy,omitempty"`
+
+	DiskEncryption *InstanceDiskEncryption `json:"disk_encryption,omitempty"`
 }
 
 // LKENodePoolUpdateOptions fields are those accepted by UpdateLKENodePoolUpdate
@@ -135,6 +136,7 @@ func (l LKENodePool) GetCreateOptions() (o LKENodePoolCreateOptions) {
 	o.UpdateStrategy = l.UpdateStrategy
 	o.Label = l.Label
 	o.FirewallID = l.FirewallID
+	o.DiskEncryption = &l.DiskEncryption
 
 	return o
 }

test/integration/fixtures/TestLKENodePoolNode_Delete.yaml

@@ -8,23 +8,23 @@ interactions:
       Accept:
       - application/json, */*
       User-Agent:
-      - integration.test/v0.0.0 (darwin/amd64) kubernetes/$Format
-    url: https://0e92bcd8-95ef-415a-99d7-5d9bc6a95a55.ap-west-1-gw.linodelke.net:443/api/v1/nodes
+      - integration.test/v0.0.0 (darwin/arm64) kubernetes/$Format
+    url: https://527aaa9b-de31-4a99-a253-31c74a6503a3.au-mel-2-gw.linodelke.net:443/api/v1/nodes
     method: GET
   response:
     body: |
-      {"kind":"NodeList","apiVersion":"v1","metadata":{"resourceVersion":"647"},"items":[{"metadata":{"name":"lke433259-645077-23ebee5d0000","uid":"1e7f47a2-e940-438b-8676-127e96345322","resourceVersion":"581","creationTimestamp":"2018-01-02T03:04:05Z","labels":{"beta.kubernetes.io/arch":"amd64","beta.kubernetes.io/instance-type":"g6-standard-2","beta.kubernetes.io/os":"linux","failure-domain.beta.kubernetes.io/region":"ap-west","kubernetes.io/arch":"amd64","kubernetes.io/hostname":"lke433259-645077-23ebee5d0000","kubernetes.io/os":"linux","lke.linode.com/pool-id":"645077","node.k8s.linode.com/host-uuid":"b2fa42934d38726a3bfae96212b57681f45b7eec","node.kubernetes.io/instance-type":"g6-standard-2","topology.kubernetes.io/region":"ap-west"},"annotations":{"kubeadm.alpha.kubernetes.io/cri-socket":"unix:///run/containerd/containerd.sock","lke.linode.com/wgip":"172.31.0.1","lke.linode.com/wgpub":"2VLj5yaFRdavY4jhxFdNSXYe3kM7Qa4EqqA+Rfhg4AY=","node.alpha.kubernetes.io/ttl":"0","node.k8s.linode.com/private-ip":"192.168.136.31","volumes.kubernetes.io/controller-managed-attach-detach":"true"},"managedFields":[{"manager":"kube-controller-manager","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:node.alpha.kubernetes.io/ttl":{}}},"f:spec":{"f:podCIDR":{},"f:podCIDRs":{".":{},"v:\"10.2.0.0/25\"":{}}}}},{"manager":"kubeadm","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:kubeadm.alpha.kubernetes.io/cri-socket":{}}}}},{"manager":"kubelet","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{".":{},"f:volumes.kubernetes.io/controller-managed-attach-detach":{}},"f:labels":{".":{},"f:beta.kubernetes.io/arch":{},"f:beta.kubernetes.io/os":{},"f:kubernetes.io/arch":{},"f:kubernetes.io/hostname":{},"f:kubernetes.io/os":{}}}}},{"manager":"linode-cloud-controller-manager-linux","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:node.k8s.linode.com/private-ip":{}},"f:labels":{"f:beta.kubernetes.io/instance-type":{},"f:failure-domain.beta.kubernetes.io/region":{},"f:node.k8s.linode.com/host-uuid":{},"f:node.kubernetes.io/instance-type":{},"f:topology.kubernetes.io/region":{}}},"f:spec":{"f:providerID":{}}}},{"manager":"linode-cloud-controller-manager-linux","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:status":{"f:addresses":{"k:{\"type\":\"ExternalIP\"}":{},"k:{\"type\":\"InternalIP\"}":{".":{},"f:address":{},"f:type":{}}}}},"subresource":"status"},{"manager":"kubectl-annotate","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:lke.linode.com/wgip":{},"f:lke.linode.com/wgpub":{}}}}},{"manager":"kubectl-label","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:lke.linode.com/pool-id":{}}}}},{"manager":"kubelet","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:status":{"f:conditions":{"k:{\"type\":\"DiskPressure\"}":{"f:lastHeartbeatTime":{}},"k:{\"type\":\"MemoryPressure\"}":{"f:lastHeartbeatTime":{}},"k:{\"type\":\"PIDPressure\"}":{"f:lastHeartbeatTime":{}},"k:{\"type\":\"Ready\"}":{"f:lastHeartbeatTime":{},"f:lastTransitionTime":{},"f:message":{},"f:reason":{},"f:status":{}}}}},"subresource":"status"}]},"spec":{"podCIDR":"10.2.0.0/25","podCIDRs":["10.2.0.0/25"],"providerID":"linode://76876854"},"status":{"capacity":{"cpu":"2","ephemeral-storage":"82486728Ki","hugepages-1Gi":"0","hugepages-2Mi":"0","memory":"4022056Ki","pods":"110"},"allocatable":{"cpu":"2","ephemeral-storage":"76019768399","hugepages-1Gi":"0","hugepages-2Mi":"0","memory":"3919656Ki","pods":"110"},"conditions":[{"type":"MemoryPressure","status":"False","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletHasSufficientMemory","message":"kubelet has sufficient memory available"},{"type":"DiskPressure","status":"False","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletHasNoDiskPressure","message":"kubelet has no disk pressure"},{"type":"PIDPressure","status":"False","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletHasSufficientPID","message":"kubelet has sufficient PID available"},{"type":"Ready","status":"True","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletReady","message":"kubelet is posting ready status"}],"addresses":[{"type":"Hostname","address":"lke433259-645077-23ebee5d0000"},{"type":"ExternalIP","address":"172.105.59.83"},{"type":"ExternalIP","address":"1234::5678"},{"type":"InternalIP","address":"192.168.136.31"}],"daemonEndpoints":{"kubeletEndpoint":{"Port":10250}},"nodeInfo":{"machineID":"c22fe598c2304c96839199d11e2e6cdb","systemUUID":"c22fe598c2304c96839199d11e2e6cdb","bootID":"79b08422-f0e5-4a97-bf7e-04bd20fdb880","kernelVersion":"6.1.0-30-cloud-amd64","osImage":"Debian GNU/Linux 12 (bookworm)","containerRuntimeVersion":"containerd://1.7.25","kubeletVersion":"v1.32.1","kubeProxyVersion":"v1.32.1","operatingSystem":"linux","architecture":"amd64"}}}]}
+      {"kind":"NodeList","apiVersion":"v1","metadata":{"resourceVersion":"833"},"items":[{"metadata":{"name":"lke584692-855491-1bc1c89c0000","uid":"1e1ce00c-aa53-42ec-9c4e-a286df283790","resourceVersion":"815","creationTimestamp":"2018-01-02T03:04:05Z","labels":{"beta.kubernetes.io/arch":"amd64","beta.kubernetes.io/instance-type":"g6-standard-2","beta.kubernetes.io/os":"linux","failure-domain.beta.kubernetes.io/region":"au-mel","kubernetes.io/arch":"amd64","kubernetes.io/hostname":"lke584692-855491-1bc1c89c0000","kubernetes.io/os":"linux","lke.linode.com/pool-id":"855491","node.k8s.linode.com/host-uuid":"8ed57c99100cea41b2ad2b7247e9e168b87f49d8","node.kubernetes.io/instance-type":"g6-standard-2","topology.kubernetes.io/region":"au-mel","topology.linode.com/region":"au-mel"},"annotations":{"csi.volume.kubernetes.io/nodeid":"{\"linodebs.csi.linode.com\":\"94907004\"}","lke.linode.com/wgip":"172.31.0.1","lke.linode.com/wgpub":"LcP5Gln/Hb/D52yvI+h8q4DecbXzKgMYIX1B7/H3a1A=","node.alpha.kubernetes.io/ttl":"0","node.k8s.linode.com/private-ip":"192.168.128.24","node.k8s.linode.com/public-ipv6":"1234::5678/128","projectcalico.org/IPv4Address":"192.168.128.24/17","projectcalico.org/IPv4IPIPTunnelAddr":"10.2.0.1","volumes.kubernetes.io/controller-managed-attach-detach":"true"},"managedFields":[{"manager":"kube-controller-manager","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:node.alpha.kubernetes.io/ttl":{}}},"f:spec":{"f:podCIDR":{},"f:podCIDRs":{".":{},"v:\"10.2.0.0/25\"":{}}}}},{"manager":"kubelet","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{".":{},"f:volumes.kubernetes.io/controller-managed-attach-detach":{}},"f:labels":{".":{},"f:beta.kubernetes.io/arch":{},"f:beta.kubernetes.io/os":{},"f:kubernetes.io/arch":{},"f:kubernetes.io/hostname":{},"f:kubernetes.io/os":{}}}}},{"manager":"kubectl-annotate","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:lke.linode.com/wgip":{},"f:lke.linode.com/wgpub":{}}}}},{"manager":"kubectl-label","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:lke.linode.com/pool-id":{}}}}},{"manager":"linode-cloud-controller-manager-linux","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:node.k8s.linode.com/private-ip":{},"f:node.k8s.linode.com/public-ipv6":{}},"f:labels":{"f:beta.kubernetes.io/instance-type":{},"f:failure-domain.beta.kubernetes.io/region":{},"f:node.k8s.linode.com/host-uuid":{},"f:node.kubernetes.io/instance-type":{},"f:topology.kubernetes.io/region":{}}},"f:spec":{"f:providerID":{}}}},{"manager":"linode-cloud-controller-manager-linux","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:status":{"f:addresses":{"k:{\"type\":\"ExternalIP\"}":{},"k:{\"type\":\"InternalIP\"}":{".":{},"f:address":{},"f:type":{}}}}},"subresource":"status"},{"manager":"calico-node","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:projectcalico.org/IPv4Address":{},"f:projectcalico.org/IPv4IPIPTunnelAddr":{}}},"f:status":{"f:conditions":{"k:{\"type\":\"NetworkUnavailable\"}":{".":{},"f:lastHeartbeatTime":{},"f:lastTransitionTime":{},"f:message":{},"f:reason":{},"f:status":{},"f:type":{}}}}},"subresource":"status"},{"manager":"kubelet","operation":"Update","apiVersion":"v1","time":"2018-01-02T03:04:05Z","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:annotations":{"f:csi.volume.kubernetes.io/nodeid":{}},"f:labels":{"f:topology.linode.com/region":{}}},"f:status":{"f:conditions":{"k:{\"type\":\"DiskPressure\"}":{"f:lastHeartbeatTime":{}},"k:{\"type\":\"MemoryPressure\"}":{"f:lastHeartbeatTime":{}},"k:{\"type\":\"PIDPressure\"}":{"f:lastHeartbeatTime":{}},"k:{\"type\":\"Ready\"}":{"f:lastHeartbeatTime":{},"f:lastTransitionTime":{},"f:message":{},"f:reason":{},"f:status":{}}},"f:images":{}}},"subresource":"status"}]},"spec":{"podCIDR":"10.2.0.0/25","podCIDRs":["10.2.0.0/25"],"providerID":"linode://94907004"},"status":{"capacity":{"cpu":"2","ephemeral-storage":"82470344Ki","hugepages-1Gi":"0","hugepages-2Mi":"0","memory":"4022024Ki","pods":"110"},"allocatable":{"cpu":"2","ephemeral-storage":"76004668905","hugepages-1Gi":"0","hugepages-2Mi":"0","memory":"3919624Ki","pods":"110"},"conditions":[{"type":"NetworkUnavailable","status":"False","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"CalicoIsUp","message":"Calico is running on this node"},{"type":"MemoryPressure","status":"False","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletHasSufficientMemory","message":"kubelet has sufficient memory available"},{"type":"DiskPressure","status":"False","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletHasNoDiskPressure","message":"kubelet has no disk pressure"},{"type":"PIDPressure","status":"False","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletHasSufficientPID","message":"kubelet has sufficient PID available"},{"type":"Ready","status":"True","lastHeartbeatTime":"2018-01-02T03:04:05Z","lastTransitionTime":"2018-01-02T03:04:05Z","reason":"KubeletReady","message":"kubelet is posting ready status"}],"addresses":[{"type":"Hostname","address":"lke584692-855491-1bc1c89c0000"},{"type":"ExternalIP","address":"172.236.32.134"},{"type":"ExternalIP","address":"1234::5678"},{"type":"InternalIP","address":"192.168.128.24"}],"daemonEndpoints":{"kubeletEndpoint":{"Port":10250}},"nodeInfo":{"machineID":"361ca227a16f4ef786d0e9ecb33ce79a","systemUUID":"361ca227a16f4ef786d0e9ecb33ce79a","bootID":"f1962ba4-4617-473c-8c8f-96d7b16a3771","kernelVersion":"6.1.0-43-cloud-amd64","osImage":"Debian GNU/Linux 12 (bookworm)","containerRuntimeVersion":"containerd://2.2.1","kubeletVersion":"v1.35.1","kubeProxyVersion":"","operatingSystem":"linux","architecture":"amd64"},"images":[{"names":["mirror.registry.linodelke.net/docker/calico/node@sha256:362f10b69142fcc654c0ab65a5f371923f9a1d8f7772eac0ff223b9dc67704de","mirror.registry.linodelke.net/docker/calico/node:v3.30.4"],"sizeBytes":156884157},{"names":["mirror.registry.linodelke.net/docker/calico/cni@sha256:807aa264f01c9b9a8c5d26d5ba4fcbc428ab1b8b9798eeac04a64f4930a30c25","mirror.registry.linodelke.net/docker/calico/cni:v3.30.4"],"sizeBytes":71942077},{"names":["mirror.registry.linodelke.net/docker/calico/kube-controllers@sha256:27d1abbc433b9f72c50fd3b1fcd29b674f6a0c6eee84938a0b6d9cf8ac5e85ff","mirror.registry.linodelke.net/docker/calico/kube-controllers:v3.30.4"],"sizeBytes":52787974},{"names":["mirror.registry.linodelke.net/docker/linode/linode-blockstorage-csi-driver@sha256:e71ed398548604799b971ff8100b8bd6568bd872ab949175ae20504c5c863231","mirror.registry.linodelke.net/docker/linode/linode-blockstorage-csi-driver:v1.1.1"],"sizeBytes":37610227},{"names":["mirror.registry.linodelke.net/k8s/sig-storage/csi-provisioner@sha256:bb057f866177d5f4139a1527e594499cbe0feeb67b63aaca8679dfdf0a6016f9","mirror.registry.linodelke.net/k8s/sig-storage/csi-provisioner:v5.3.0"],"sizeBytes":35709312},{"names":["mirror.registry.linodelke.net/docker/calico/typha@sha256:8bb31fa2ba799cfe37451534be29e09598982451374f8ce41133171eb6070777","mirror.registry.linodelke.net/docker/calico/typha:v3.30.4"],"sizeBytes":35235100},{"names":["mirror.registry.linodelke.net/k8s/kube-proxy@sha256:8743aec6a360aedcb7a076cbecea367b072abe1bfade2e2098650df502e2bc89","mirror.registry.linodelke.net/k8s/kube-proxy:v1.35.3"],"sizeBytes":25684340},{"names":["mirror.registry.linodelke.net/k8s/coredns/coredns@sha256:9b9128672209474da07c91439bf15ed704ae05ad918dd6454e5b6ae14e35fee6","mirror.registry.linodelke.net/k8s/coredns/coredns:v1.13.1"],"sizeBytes":23553139},{"names":["mirror.registry.linodelke.net/k8s/sig-storage/csi-node-driver-registrar@sha256:5244abbe87e01b35adeb8bb13882a74785df0c0619f8325c9e950395c3f72a97","mirror.registry.linodelke.net/k8s/sig-storage/csi-node-driver-registrar:v2.14.0"],"sizeBytes":15579380},{"names":["mirror.registry.linodelke.net/k8s/cpa/cluster-proportional-autoscaler@sha256:a4d0ab78d5e2ec356c981f361a5ff7012b21ad353b4a980e1ca30c11dda6564b","mirror.registry.linodelke.net/k8s/cpa/cluster-proportional-autoscaler:v1.10.3"],"sizeBytes":13818385},{"names":["mirror.registry.linodelke.net/docker/calico/pod2daemon-flexvol@sha256:a0c9f5cf7f3d2d73565250bb08e2b04f8e605a072176cbd65e6392a4af6c2078","mirror.registry.linodelke.net/docker/calico/pod2daemon-flexvol:v3.30.4"],"sizeBytes":5941932},{"names":["registry.k8s.io/pause@sha256:1ff6c18fbef2045af6b9c16bf034cc421a29027b800e4f9b68ae9b1cb3e9ae07","registry.k8s.io/pause:3.5"],"sizeBytes":301416}],"runtimeHandlers":[{"name":"","features":{"recursiveReadOnlyMounts":true,"userNamespaces":true}},{"name":"runc","features":{"recursiveReadOnlyMounts":true,"userNamespaces":true}}],"features":{"supplementalGroupsPolicy":true}}}]}
     headers:
       Audit-Id:
-      - 9bb74e92-85ce-4fc1-bf56-f6f72f8dd439
+      - 751ce9b8-26bf-429c-a3ea-bf5374759cf7
       Cache-Control:
       - no-cache, private
       Content-Type:
       - application/json
       X-Kubernetes-Pf-Flowschema-Uid:
-      - 5cd33588-9b79-4a3c-8db3-30d50fb108d6
+      - 0e06b7df-0266-4088-b0df-4ef9a94c00eb
       X-Kubernetes-Pf-Prioritylevel-Uid:
-      - 0006a400-4bc3-415e-8ea6-b07a90fa28d6
+      - 34707ec7-88bf-4d25-865c-73adf3539bda
     status: 200 OK
     code: 200
     duration: ""

test/integration/fixtures/TestLKENodePoolNode_Get.yaml

@@ -33,9 +33,11 @@ interactions:
       Content-Type:
       - application/json
       Expires:
-      - Mon, 12 May 2025 20:28:32 GMT
+      - Thu, 26 Mar 2026 19:14:17 GMT
       Pragma:
       - no-cache
+      Strict-Transport-Security:
+      - max-age=31536000
       Vary:
       - Authorization, X-Filter
       X-Accepted-Oauth-Scopes:
@@ -45,7 +47,7 @@ interactions:
       X-Oauth-Scopes:
       - '*'
       X-Ratelimit-Limit:
-      - "1600"
+      - "1840"
     status: 404 Not Found
     code: 404
     duration: ""