From 1f42be105c959d5b521e0b7d84546df9e243a89d Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Wed, 4 Mar 2020 10:21:51 -0700
Subject: [PATCH] Update k3sConfig shape based on new api design

rancher/rancher#25720
---
 .../addon/components/cluster-row/template.hbs        |  4 ++--
 .../cluster-driver/driver-import/component.js        |  2 +-
 .../addon/components/k3s-cluster-info/component.js   |  2 +-
 .../addon/components/k3s-cluster-info/template.hbs   | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/global-admin/addon/components/cluster-row/template.hbs b/lib/global-admin/addon/components/cluster-row/template.hbs
index a3520de24..e855bca28 100644
--- a/lib/global-admin/addon/components/cluster-row/template.hbs
+++ b/lib/global-admin/addon/components/cluster-row/template.hbs
@@ -38,9 +38,9 @@
     {{cluster-template-revision-upgrade-notification cluster=model}}
   </td>
   <td data-title="{{dt.provider}}">
-    {{#if (or model.k3sConfig.kubernetesVersion.gitVersion model.version.gitVersion)}}
+    {{#if (or model.k3sConfig.kubernetesVersion model.version.gitVersion)}}
       <small>{{model.displayProvider}}</small>
-      <p class="text-small text-muted m-0">{{or model.k3sConfig.kubernetesVersion.gitVersion model.version.gitVersion}}</p>
+      <p class="text-small text-muted m-0">{{or model.k3sConfig.kubernetesVersion model.version.gitVersion}}</p>
     {{else}}
       <small>{{model.displayProvider}}</small>
     {{/if}}
diff --git a/lib/shared/addon/components/cluster-driver/driver-import/component.js b/lib/shared/addon/components/cluster-driver/driver-import/component.js
index 11c818493..3c0527e8a 100644
--- a/lib/shared/addon/components/cluster-driver/driver-import/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-import/component.js
@@ -43,7 +43,7 @@ export default Component.extend(ClusterDriver, {
           type:              'k3sConfig',
           serverConcurrency: 1,
           workerConcurrency: 1,
-          kubernetesVersion: { gitVersion: this.cluster.version.gitVersion }
+          kubernetesVersion: this.cluster.version.gitVersion
         }));
       }
     }
diff --git a/lib/shared/addon/components/k3s-cluster-info/component.js b/lib/shared/addon/components/k3s-cluster-info/component.js
index f4563e2c9..51678141d 100644
--- a/lib/shared/addon/components/k3s-cluster-info/component.js
+++ b/lib/shared/addon/components/k3s-cluster-info/component.js
@@ -13,7 +13,7 @@ export default Component.extend({
   editing:     false,
   k3sConfig:   alias('cluster.k3sConfig'),
   allVersions: computed('k3s.allVersions.[]', function() {
-    const currentVersion = get(this, 'k3sConfig.kubernetesVersion.gitVersion');
+    const currentVersion = get(this, 'k3sConfig.kubernetesVersion');
     const allVersions    = this.k3s.allVersions || [];
     const versionsMapped = [];
 
diff --git a/lib/shared/addon/components/k3s-cluster-info/template.hbs b/lib/shared/addon/components/k3s-cluster-info/template.hbs
index 7c0eb4369..8d20bb0f0 100644
--- a/lib/shared/addon/components/k3s-cluster-info/template.hbs
+++ b/lib/shared/addon/components/k3s-cluster-info/template.hbs
@@ -5,12 +5,12 @@
     <div class="form-control">
       {{#input-or-display
          editable=editing
-         value=k3sConfig.kubernetesVersion.gitVersion
+         value=k3sConfig.kubernetesVersion
       }}
         {{searchable-select
           classNames="form-control"
           content=allVersions
-          value=k3sConfig.kubernetesVersion.gitVersion
+          value=k3sConfig.kubernetesVersion
           readOnly=(not editing)
         }}
       {{/input-or-display}}
@@ -25,13 +25,13 @@
     <div class="form-control">
       {{#input-or-display
          editable=editing
-         value=k3sConfig.serverConcurrency
+         value=k3sConfig.k3supgradeStrategy.serverConcurrency
       }}
         {{input
           id="node-server-concurrency"
           class="form-control"
           type="number"
-          value=k3sConfig.serverConcurrency
+          value=k3sConfig.k3supgradeStrategy.serverConcurrency
         }}
       {{/input-or-display}}
     </div>
@@ -43,13 +43,13 @@
     <div class="form-control">
       {{#input-or-display
          editable=editing
-         value=k3sConfig.workerConcurrency
+         value=k3sConfig.k3supgradeStrategy.workerConcurrency
       }}
         {{input
           id="node-worker-concurrency"
           class="form-control"
           type="number"
-          value=k3sConfig.workerConcurrency
+          value=k3sConfig.k3supgradeStrategy.workerConcurrency
         }}
       {{/input-or-display}}
     </div>