From 4761bd0ab91ef4d8200941a533418918b4a185ce Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Thu, 1 Jul 2021 08:45:02 -0700 Subject: [PATCH] Remove machine provider check from mgmt cluster, update provision check --- models/management.cattle.io.cluster.js | 7 ------- models/provisioning.cattle.io.cluster.js | 7 +++---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/models/management.cattle.io.cluster.js b/models/management.cattle.io.cluster.js index 3b3cf53127..bb5f6ab5c0 100644 --- a/models/management.cattle.io.cluster.js +++ b/models/management.cattle.io.cluster.js @@ -30,13 +30,6 @@ export default { }, ]; - const provisioner = this?.provisioner ?? ''; - const v2Providers = ['aks', 'gke', 'eks']; - - if (v2Providers.includes(provisioner)) { - return out.filter(deet => deet.label !== 'Machine Provider'); - } - return out; }, diff --git a/models/provisioning.cattle.io.cluster.js b/models/provisioning.cattle.io.cluster.js index d605aa2b4f..87bc6239ce 100644 --- a/models/provisioning.cattle.io.cluster.js +++ b/models/provisioning.cattle.io.cluster.js @@ -23,11 +23,10 @@ export default { }, ]; - const provisioner = this?.provisioner ?? ''; - const v2Providers = ['aks', 'gke', 'eks']; + if (!this.machineProvider) { + out.splice(1, 1); - if (v2Providers.includes(provisioner)) { - return out.filter(deet => deet.label !== 'Machine Provider'); + return out; } return out;