diff --git a/app/authenticated/cluster/edit/route.js b/app/authenticated/cluster/edit/route.js
index 8cd0e7b0d5..5e9c3bd0f5 100644
--- a/app/authenticated/cluster/edit/route.js
+++ b/app/authenticated/cluster/edit/route.js
@@ -9,7 +9,7 @@ import { scheduleOnce } from '@ember/runloop';
export default Route.extend({
access: service(),
globalStore: service(),
- k3s: service(),
+ releaseVersions: service(),
clusterTemplateService: service('clusterTemplates'),
roleTemplateService: service('roleTemplate'),
@@ -20,6 +20,7 @@ export default Route.extend({
let modelOut = {
originalCluster: cluster,
cluster: cluster.clone(),
+ cloudCredentials: globalStore.findAll('cloudcredential'),
kontainerDrivers: globalStore.findAll('kontainerDriver'),
nodeTemplates: globalStore.findAll('nodeTemplate'),
nodeDrivers: globalStore.findAll('nodeDriver'),
@@ -30,8 +31,8 @@ export default Route.extend({
me: get(this, 'access.principal'),
};
- if (cluster.driver === 'k3s') {
- modelOut['k3sVersions'] = this.k3s.getAllVersions();
+ if (cluster.driver === 'k3s' || cluster.driver === 'rke2') {
+ this.releaseVersions.getAllVersions(cluster.driver);
}
if (!isEmpty(cluster.clusterTemplateRevisionId)) {
diff --git a/app/authenticated/cluster/edit/template.hbs b/app/authenticated/cluster/edit/template.hbs
index b42aec9e67..77b1a6dad4 100644
--- a/app/authenticated/cluster/edit/template.hbs
+++ b/app/authenticated/cluster/edit/template.hbs
@@ -1,6 +1,6 @@
- {{t "clustersPage.editClusterName" name=model.originalCluster.displayName}} ({{driver-name provider}})
+ {{t "clustersPage.editClusterName" name=model.originalCluster.displayName}} ({{model.originalCluster.displayProvider}})
- {{t "clusterNew.custom.helpBlock"}} -
-- {{t "clusterNew.custom.helpBlock"}} -
-- {{t "clusterNew.import.helpBlock" - appName=settings.appName - htmlSafe=true - }} -
-- {{t "clusterNew.import.helpBlock" - appName=settings.appName - htmlSafe=true - }} -
-+ {{t "clusterNew.custom.helpBlock"}} +
++ {{t + "clusterNew.import.helpBlock" + appName=settings.appName + htmlSafe=true + }} +
+{{driver-name provider.name}}
++ {{driver-name provider.name}} +
{{driver-name provider.name}}
++ {{driver-name provider.name}} +
{{driver-name provider.name}}
-+ {{driver-name provider.name}} +
+{{driver-name provider.name}}
++ {{driver-name provider.name}} +
+ {{t + "clusterNew.import.select.other.helpBlock" + appName=settings.appName + htmlSafe=true + }} +
++ {{t + "clusterNew.importEks.helpBlock" + appName=settings.appName + htmlSafe=true + }} +
+