Skip to content

Commit 1b2d1a7

Browse files
ezilber-akamaiezilber-akamai
authored
Revert "Implemented changes for Linode Disk Encryption (#550)" (#581)
This reverts commit 19fb287.
1 parent 19fb287 commit 1b2d1a7

File tree

14 files changed

+5
-264
lines changed

14 files changed

+5
-264
lines changed

‎docs/modules/instance.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ Manage Linode Instances, Configs, and Disks.
149149
| `auto_disk_resize` | <center>`bool`</center> | <center>Optional</center> | Whether implicitly created disks should be resized during a type change operation. **(Default: `False`)** |
150150
| `tags` | <center>`list`</center> | <center>Optional</center> | An array of tags applied to this object. Tags are for organizational purposes only. **(Updatable)** |
151151
| [`placement_group` (sub-options)](#placement_group) | <center>`dict`</center> | <center>Optional</center> | A Placement Group to create this Linode under. |
152-
| `disk_encryption` | <center>`str`</center> | <center>Optional</center> | The disk encryption status of this Linode. NOTE: Disk encryption may not currently be available to all users. **(Choices: `enabled`, `disabled`)** |
153152
| `swap_size` | <center>`int`</center> | <center>Optional</center> | When deploying from an Image, this field is optional, otherwise it is ignored. This is used to set the swap disk size for the newly-created Linode. |
154153

155154
### configs
@@ -275,7 +274,6 @@ Manage Linode Instances, Configs, and Disks.
275274
| `authorized_keys` | <center>`list`</center> | <center>Optional</center> | A list of SSH public key parts to deploy for the root user. |
276275
| `authorized_users` | <center>`list`</center> | <center>Optional</center> | A list of usernames. |
277276
| `filesystem` | <center>`str`</center> | <center>Optional</center> | The filesystem to create this disk with. |
278-
| `disk_encryption` | <center>`str`</center> | <center>Optional</center> | The disk encryption status of this disk.NOTE: Disk encryption may not currently be available to all users. **(Choices: `enabled`, `disabled`)** |
279277
| `image` | <center>`str`</center> | <center>Optional</center> | An Image ID to deploy the Disk from. |
280278
| `root_pass` | <center>`str`</center> | <center>Optional</center> | The root user’s password on the newly-created Linode. |
281279
| `stackscript_id` | <center>`int`</center> | <center>Optional</center> | The ID of the StackScript to use when creating the instance. See the [Linode API documentation](https://techdocs.akamai.com/linode-api/reference/get-stack-scripts). |
@@ -356,8 +354,6 @@ Manage Linode Instances, Configs, and Disks.
356354
"placement_group_type": "anti_affinity:local",
357355
"placement_group_policy": "strict"
358356
}
359-
"disk_encryption": "enabled",
360-
"lke_cluster_id": null
361357
}
362358
```
363359
- See the [Linode API response documentation](https://techdocs.akamai.com/linode-api/reference/get-linode-instance) for a list of returned fields
@@ -443,8 +439,7 @@ Manage Linode Instances, Configs, and Disks.
443439
"label": "Debian 9 Disk",
444440
"size": 48640,
445441
"status": "ready",
446-
"updated": "2018-01-01T00:01:01",
447-
"disk_encryption": "enabled"
442+
"updated": "2018-01-01T00:01:01"
448443
}
449444
]
450445
```

‎docs/modules/instance_info.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ Get info about a Linode Instance.
8989
"placement_group_type": "anti_affinity:local",
9090
"placement_group_policy": "strict"
9191
}
92-
"disk_encryption": "enabled",
93-
"lke_cluster_id": null
9492
}
9593
```
9694
- See the [Linode API response documentation](https://techdocs.akamai.com/linode-api/reference/get-linode-instance) for a list of returned fields
@@ -176,8 +174,7 @@ Get info about a Linode Instance.
176174
"label": "Debian 9 Disk",
177175
"size": 48640,
178176
"status": "ready",
179-
"updated": "2018-01-01T00:01:01",
180-
"disk_encryption": "enabled"
177+
"updated": "2018-01-01T00:01:01"
181178
}
182179
]
183180
```

‎docs/modules/instance_list.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ List and filter on Instances.
9494
],
9595
"type": "g6-standard-1",
9696
"updated": "2018-01-01T00:01:01",
97-
"watchdog_enabled": true,
98-
"disk_encryption": "enabled",
99-
"lke_cluster_id": null
97+
"watchdog_enabled": true
10098
}
10199
]
102100
```

‎docs/modules/lke_cluster.md

-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ Manage Linode LKE clusters.
139139
"max": 12,
140140
"min": 3
141141
},
142-
"disk_encryption": "enabled",
143142
"count": 6,
144143
"disks": [
145144
{

‎docs/modules/lke_cluster_info.md

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ Get info about a Linode LKE cluster.
7777
"max": 12,
7878
"min": 3
7979
},
80-
"disk_encryption": "enabled",
8180
"count": 6,
8281
"disks": [
8382
{

‎docs/modules/lke_node_pool.md

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ Manage Linode LKE cluster node pools.
8989
"max": 12,
9090
"min": 3
9191
},
92-
"disk_encryption": "enabled",
9392
"count": 6,
9493
"disks": [
9594
{

‎plugins/module_utils/doc_fragments/instance.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@
135135
"placement_group_type": "anti_affinity:local",
136136
"placement_group_policy": "strict"
137137
}
138-
"disk_encryption": "enabled",
139-
"lke_cluster_id": null
140138
}''']
141139

142140
result_configs_samples = ['''[
@@ -208,8 +206,7 @@
208206
"label": "Debian 9 Disk",
209207
"size": 48640,
210208
"status": "ready",
211-
"updated": "2018-01-01T00:01:01",
212-
"disk_encryption": "enabled"
209+
"updated": "2018-01-01T00:01:01"
213210
}
214211
]''']
215212

‎plugins/module_utils/doc_fragments/instance_list.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
],
5454
"type": "g6-standard-1",
5555
"updated": "2018-01-01T00:01:01",
56-
"watchdog_enabled": true,
57-
"disk_encryption": "enabled",
58-
"lke_cluster_id": null
56+
"watchdog_enabled": true
5957
}
6058
]''']

‎plugins/module_utils/doc_fragments/lke_cluster.py

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
"max": 12,
6161
"min": 3
6262
},
63-
"disk_encryption": "enabled",
6463
"count": 6,
6564
"disks": [
6665
{

‎plugins/module_utils/doc_fragments/lke_node_pool.py

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"max": 12,
3636
"min": 3
3737
},
38-
"disk_encryption": "enabled",
3938
"count": 6,
4039
"disks": [
4140
{

‎plugins/modules/instance.py

-12
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@
8383
type=FieldType.string,
8484
description=["The filesystem to create this disk with."],
8585
),
86-
"disk_encryption": SpecField(
87-
type=FieldType.string,
88-
description="The disk encryption status of this disk."
89-
+ "NOTE: Disk encryption may not currently be available to all users.",
90-
choices=["enabled", "disabled"],
91-
),
9286
"image": SpecField(
9387
type=FieldType.string,
9488
description=["An Image ID to deploy the Disk from."],
@@ -529,12 +523,6 @@
529523
suboptions=linode_instance_placement_group_spec,
530524
description=["A Placement Group to create this Linode under."],
531525
),
532-
"disk_encryption": SpecField(
533-
type=FieldType.string,
534-
description="The disk encryption status of this Linode. "
535-
+ "NOTE: Disk encryption may not currently be available to all users.",
536-
choices=["enabled", "disabled"],
537-
),
538526
"swap_size": SpecField(
539527
type=FieldType.integer,
540528
description=[

‎tests/integration/targets/instance_disk_encryption/tasks/main.yaml

-143
This file was deleted.

‎tests/integration/targets/lke_cluster_basic/tasks/main.yaml

-30
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
# Sometimes only one LKE version is available for provisioning
1717
kube_version: '{{ lke_versions[1].id if lke_versions|length > 1 else lke_versions[0].id }}'
1818

19-
- name: List regions that support Disk Encryption
20-
linode.cloud.region_list: {}
21-
register: all_regions
22-
23-
- set_fact:
24-
lde_region: '{{ (all_regions.regions | selectattr("capabilities", "search", "Disk Encryption") | list)[0].id }}'
25-
2619
- name: Create a Linode LKE cluster
2720
linode.cloud.lke_cluster:
2821
label: 'ansible-test-{{ r }}'
@@ -154,23 +147,6 @@
154147
- info_by_label.node_pools[0].count == 1
155148
- info_by_label.node_pools[0].id == create_cluster.node_pools[0].id
156149

157-
- name: Create a Linode LKE cluster with a pool with disk encryption enabled
158-
linode.cloud.lke_cluster:
159-
label: 'ansible-test-de-{{ r }}'
160-
region: '{{ lde_region }}'
161-
k8s_version: '{{ old_kube_version }}'
162-
node_pools:
163-
- type: g6-standard-1
164-
count: 3
165-
skip_polling: true
166-
state: present
167-
register: create_cluster_disk_encryption
168-
169-
- name: Assert LKE cluster is created
170-
assert:
171-
that:
172-
- create_cluster_disk_encryption.node_pools[0].disk_encryption == 'enabled'
173-
174150
always:
175151
- ignore_errors: yes
176152
block:
@@ -179,12 +155,6 @@
179155
label: '{{ create_cluster.cluster.label }}'
180156
state: absent
181157

182-
- name: Delete the LKE cluster
183-
linode.cloud.lke_cluster:
184-
label: '{{ create_cluster_disk_encryption.cluster.label }}'
185-
state: absent
186-
187-
188158
environment:
189159
LINODE_UA_PREFIX: '{{ ua_prefix }}'
190160
LINODE_API_TOKEN: '{{ api_token }}'

0 commit comments

Comments
 (0)