Merge pull request #3203 from westlywright/cluster.templates.bugs

Private Registry and Share Member Bugs

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

@@ -269,6 +269,11 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
               hideQuestion
             });
 
+            if (path.includes('rancherKubernetesEngineConfig.privateRegistries[0]')) {
+              // need to replace the array target with built in first object so the alias works
+              path = path.replace('[0]', '.firstObject');
+            }
+
             defineProperty(question, 'default', alias(`primaryResource.${ path }`));
 
             clusterTemplateQuestions.pushObject(question);
@@ -1220,7 +1225,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
       this.notifyPropertyChange('initialNodeCounts');
     });
 
-    if (this.isEdit && this.cluster.appliedSpec) {
+    if (this.isEdit && !isEmpty(get(this, 'cluster.appliedSpec.rancherKubernetesEngineConfig.kubernetesVersion'))) {
       initialVersion = this.cluster.appliedSpec.rancherKubernetesEngineConfig.kubernetesVersion;
     }
 

lib/shared/addon/components/cru-private-registry/component.js

@@ -8,7 +8,6 @@ import {
 } from '@ember/object';
 import { alias, gt } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-import { scheduleOnce } from '@ember/runloop';
 
 export default Component.extend({
   globalStore:       service(),
@@ -34,7 +33,6 @@ export default Component.extend({
   init() {
     this._super(...arguments);
 
-    scheduleOnce('afterRender', () => {
     set(this, 'config', get(this, `cluster.${ get(this, 'configName') }`));
 
     if (this.config.privateRegistries) {
@@ -45,7 +43,6 @@ export default Component.extend({
         });
       }
     }
-    });
   },
 
   actions: {

lib/shared/addon/components/form-share-member/template.hbs

@@ -22,6 +22,7 @@
     @pagingLabel="pagination.cluster"
     @headers={{membersHeaders}}
     @stickyHeader={{false}}
+    @search={{false}}
     as |sortable kind member dt|
   >
     {{#if (eq kind "row")}}

lib/shared/addon/utils/constants.js

@@ -859,7 +859,9 @@ C.CLUSTER_TEMPLATE_IGNORED_OVERRIDES = [
   'rancherKubernetesEngineConfig.network.options.flannel_backend_vni',
   'rancherKubernetesEngineConfig.network.plugin',
   'rancherKubernetesEngineConfig.network.weaveNetworkProvider',
-  'rancherKubernetesEngineConfig.privateRegistries[]',
+  'rancherKubernetesEngineConfig.privateRegistries[0].url',
+  'rancherKubernetesEngineConfig.privateRegistries[0].user',
+  'rancherKubernetesEngineConfig.privateRegistries[0].password',
   'rancherKubernetesEngineConfig.services.etcd.backupConfig.enabled',
   'rancherKubernetesEngineConfig.services.etcd.backupConfig.intervalHours',
   'rancherKubernetesEngineConfig.services.etcd.backupConfig.retention',