Skip to content

Commit a2ab3ca

Browse files
committed
Merge branch 'feat/add-appendRkeUserdata-flag' into release-2.11.x
2 parents 3baa634 + b631e64 commit a2ab3ca

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pkg/ionoscloud/machine-config/ionoscloud.vue

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ const TEMPLATE_SELECT_OPTIONS = [
138138
label: 'Memory Cube L',
139139
value: {'value': 'Memory Cube L', 'name': 'Memory Cube L'}
140140
},
141-
{
142-
label: 'Memory Cube L',
143-
value: {'value': 'Memory Cube L', 'name': 'Memory Cube L'}
144-
},
145141
{
146142
label: 'Memory Cube M',
147143
value: {'value': 'Memory Cube M', 'name': 'Memory Cube M'}
@@ -466,6 +462,7 @@ export default defineComponent({
466462
natLansToGateways: this.getNatLansToGateways(this.value?.natLansToGateways) || [],
467463
natFlowlogs: this.value?.natFlowlogs || [],
468464
natPublicIps: this.value?.natPublicIps || [],
465+
appendRkeUserdata: this.value?.appendRkeUserdata || false,
469466
natRules: this.mode == 'create' ? defaultNatRules : this.value?.natRules || [],
470467
natRuleName: '',
471468
natRuleType: 'SNAT',
@@ -727,6 +724,7 @@ export default defineComponent({
727724
this.value.waitForIpChangeTimeout = this.waitForIpChangeTimeout;
728725
this.value.natId = this.natId;
729726
this.value.natName = this.natName;
727+
this.value.appendRkeUserdata = this.appendRkeUserdata;
730728
this.value.createNat = this.createNat;
731729
this.value.natLansToGateways = this.formatNatLansToGateways();
732730
this.value.natFlowlogs = this.natFlowlogs;
@@ -917,6 +915,15 @@ export default defineComponent({
917915
/>
918916
<p class="help-block">Should the driver only add the SSH info in the user data? (required for custom images).</p>
919917
</div>
918+
<div class="col span-4">
919+
<Checkbox
920+
label="Append RKE provisioning config in the userdata sent to the server"
921+
v-model:value="appendRkeUserdata"
922+
:mode="mode"
923+
:disabled="busy"
924+
/>
925+
<p class="help-block">Whether or not the driver should append the RKE provisioning generated by Rancher to the user-data, is sent to the server even if no addition user-data is specified inside the cloudInit block.</p>
926+
</div>
920927
</div>
921928
922929
<div class="row mt-10">

pkg/ionoscloud/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ionoscloud",
33
"description": "Adds Machine Config and Cloud Credeantials for the ionoscloud rancher driver",
4-
"version": "0.4.0",
4+
"version": "0.4.1",
55
"private": false,
66
"icon": "https://raw.githubusercontent.com/ionos-cloud/ui-extensions-ionoscloud/main/pkg/ionoscloud/ionos.svg",
77
"rancher": {

0 commit comments

Comments
 (0)