From d23b54d9d03cbbc5b6f187e55d6a82510f22efc7 Mon Sep 17 00:00:00 2001 From: Lena Garber Date: Tue, 19 Apr 2022 14:55:37 +0000 Subject: [PATCH 1/2] Add HA option --- .../driver-linodelke/component.js | 4 +++ .../driver-linodelke/template.hbs | 28 +++++++++++++++++++ translations/en-us.yaml | 3 ++ 3 files changed, 35 insertions(+) diff --git a/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js b/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js index 139516b2b..1d93661ee 100644 --- a/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js @@ -64,6 +64,9 @@ export default Component.extend(ClusterDriver, { let configField = get(this, 'configField'); setProperties(this, { + // We should store the previous state of HA to disallow downgrades + 'highAvailability': config ? config.highAvailability : false, + 'newTag': '', 'selectedNodePoolType': '', 'selectedNodePoolObj': {}, @@ -79,6 +82,7 @@ export default Component.extend(ClusterDriver, { accessToken: '', region: 'us-central', kubernetesVersion: '', + highAvailability: false, tags: [], nodePools: [] }); diff --git a/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs index 7eeee590e..e6488544d 100644 --- a/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs +++ b/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs @@ -80,6 +80,34 @@ {{/if}} +
+
+ + {{#input-or-display + editable=true + value=cluster.lkeEngineConfig.highAvailability + }} +
+ +
+
+ +
+ {{/input-or-display}} +

+ {{t "clusterNew.linodelke.highAvailability.warning"}} +

+
+
diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 5ba295d7a..960ce8ac3 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -4272,6 +4272,9 @@ clusterNew: loading: Saving your cluster configuration next: Proceed to Node pool selection title: Cluster Configuration + highAvailability: + label: High Availability + warning: Once a cluster has been upgraded to High Availability, it cannot be downgraded. kubernetesVersion: label: Kubernetes Version placeholder: Select a kubernetes version for your cluster From a07f8863e264c88e18a5ab7ee2ce55f941cab85b Mon Sep 17 00:00:00 2001 From: LBGarber Date: Tue, 5 Jul 2022 10:55:27 -0400 Subject: [PATCH 2/2] Add price to HA option --- .../driver-linodelke/component.js | 23 ++++++++++--------- .../driver-linodelke/template.hbs | 1 + translations/en-us.yaml | 3 ++- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js b/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js index 1d93661ee..25247895a 100644 --- a/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-linodelke/component.js @@ -46,16 +46,18 @@ const NODE_POOL_HEADERS = [ ]; export default Component.extend(ClusterDriver, { - intl: service(), - linode: service(), + intl: service(), + linode: service(), layout, - configField: 'lkeEngineConfig', - step: 1, - lanChanged: null, - refresh: false, - sortBy: '', - descending: false, - nodePoolHeaders: NODE_POOL_HEADERS, + configField: 'lkeEngineConfig', + step: 1, + lanChanged: null, + refresh: false, + sortBy: '', + descending: false, + nodePoolHeaders: NODE_POOL_HEADERS, + // This value is currently not returned by the Linode API + highAvailabilityMonthlyPrice: 60.0, init() { this._super(...arguments); @@ -66,7 +68,6 @@ export default Component.extend(ClusterDriver, { setProperties(this, { // We should store the previous state of HA to disallow downgrades 'highAvailability': config ? config.highAvailability : false, - 'newTag': '', 'selectedNodePoolType': '', 'selectedNodePoolObj': {}, @@ -82,7 +83,7 @@ export default Component.extend(ClusterDriver, { accessToken: '', region: 'us-central', kubernetesVersion: '', - highAvailability: false, + highAvailability: false, tags: [], nodePools: [] }); diff --git a/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs index e6488544d..6ed2f38ad 100644 --- a/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs +++ b/lib/shared/addon/components/cluster-driver/driver-linodelke/template.hbs @@ -94,6 +94,7 @@
diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 960ce8ac3..2afad9ffb 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -4275,6 +4275,7 @@ clusterNew: highAvailability: label: High Availability warning: Once a cluster has been upgraded to High Availability, it cannot be downgraded. + month: month kubernetesVersion: label: Kubernetes Version placeholder: Select a kubernetes version for your cluster @@ -4652,7 +4653,7 @@ clusterNew: networkPolicy: label: Project Network Isolation editHelp: The Project Network Isolation option cannot be changed after the cluster is created - selectNetworkPolicyHelp: You must have a Network Policy selected to use Project Network Isolation + selectNetworkPolicyHelp: You must have a Network Policy selected to use Project Network Isolation nodeName: detail: Optionally configure the node name as identification instead of the actual hostname placeholder: e.g. my-worker-node