Insecure import, AKS size

lib/shared/addon/components/cluster-driver/driver-azureaks/component.js

@@ -36,7 +36,7 @@ export default Component.extend(ClusterDriver, {
         osDiskSizeGb: 100,
         adminUsername: 'azureuser',
         kubernetesVersion: '1.8.1',
-        nodeCount: 3,
+        count: 3,
         agentVmSize: 'Standard_A2',
         location: 'eastus',
       });

lib/shared/addon/components/cluster-driver/driver-azureaks/template.hbs

@@ -124,8 +124,8 @@
 
     <div class="row">
       <div class="col span-6">
-        <label class="acc-label">{{t 'clusterNew.googlegke.nodeCount.label'}}</label>
-        {{input-number min=1 value=config.nodeCount}}
+        <label class="acc-label">{{t 'clusterNew.azureaks.count.label'}}</label>
+        {{input-number min=1 value=config.count}}
       </div>
       <div class="col span-6">
         <label class="acc-label">{{t 'clusterNew.azureaks.machineType.label'}}</label>

lib/shared/addon/components/cluster-driver/driver-import/template.hbs

@@ -2,11 +2,11 @@
   {{save-cancel save="driverSave" cancel="close"}}
 {{else}}
   <div class="mt-20">
-    {{banner-message color="bg-info" message=(t 'clusterNew.import.command.instructions'
+    {{t 'clusterNew.import.command.instructions'
       appName=settings.appName
       docsBase=settings.docsBase
       htmlSafe=true
-    )}}
+    }}
   </div>
 
   <div class="copy-pre mt-20 mb-20">
@@ -14,6 +14,19 @@
     <pre id="registration-command" style="font-size: 14px;">{{token.command}}</pre>
   </div>
 
+  <div class="mt-20">
+    {{t 'clusterNew.import.command.instructionsInsecure'
+      appName=settings.appName
+      docsBase=settings.docsBase
+      htmlSafe=true
+    }}
+  </div>
+
+  <div class="copy-pre mt-20 mb-20">
+    {{copy-to-clipboard clipboardText=token.insecureCommand tagName="div" classNames="copy-to-pre"}}
+    <pre id="registration-command" style="font-size: 14px;">{{token.insecureCommand}}</pre>
+  </div>
+
   <div class="footer-actions">
     <button {{action "close"}} class="btn bg-primary">{{t 'clusterNew.rke.done'}}</button>
   </div>

translations/en-us.yaml

@@ -3169,6 +3169,8 @@ clusterNew:
       help: 'You can find instructions on how to create a Client ID and Secret <a href="https://www.packer.io/docs/builders/azure-setup.html" target="_blank">here</a>.'
     placement:
       label: Placement
+    count:
+      label: Node Count
     location:
       label: Location
       prompt: Choose a location...
@@ -3375,7 +3377,8 @@ clusterNew:
     label: Imported
     shortLabel: Imported
     command:
-      instructions: Run the kubectl command below on an existing Kubernetes 1.8.x cluster to import it into {appName}
+      instructions: "Run the kubectl command below on an existing Kubernetes 1.8.x cluster to import it into {appName}:"
+      instructionsInsecure: "If you get an error about 'certificate signed by unknown authority' because your {appName} installation is not running with a SSL certificate signed by a recognized public CA, run the command below instead to bypass the certificate check:"
 
 
 nodeDriver: