Role back rke cluster defaults changes

rancher/rancher#15577

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

@@ -200,11 +200,45 @@ export default InputTextFile.extend(ClusterDriver, {
 
       const rkeConfig = globalStore.createRecord({
         type:                'rancherKubernetesEngineConfig',
+        ignoreDockerVersion: true,
         kubernetesVersion:   get(this, `settings.${ C.SETTING.VERSION_K8S_DEFAULT }`),
+        authentication:      globalStore.createRecord({
+          type:     'authnConfig',
+          strategy: 'x509',
+        }),
+        network: globalStore.createRecord({
+          type:    'networkConfig',
+          plugin:  'canal',
+          options: { flannel_backend_type: null, },
+        }),
+        ingress: globalStore.createRecord({
+          type:     'ingressConfig',
+          provider: 'nginx',
+        }),
+        monitoring: globalStore.createRecord({
+          type:     'monitoringConfig',
+          provider: 'metrics-server',
+        }),
+        services: globalStore.createRecord({
+          type:    'rkeConfigServices',
+          kubeApi: globalStore.createRecord({
+            type:                  'kubeAPIService',
+            podSecurityPolicy:     false,
+            serviceNodePortRange: '30000-32767',
+          }),
+          etcd: globalStore.createRecord({
+            type:      'etcdService',
+            extraArgs: {
+              'heartbeat-interval': 500,
+              'election-timeout':   5000
+            },
+          }),
+        }),
       });
 
       scheduleOnce('afterRender', () => {
-        setProperties(get(this, 'cluster'), { rancherKubernetesEngineConfig: rkeConfig });
+        set(this, 'cluster.rancherKubernetesEngineConfig', rkeConfig);
+        set(this, 'cluster.enableNetworkPolicy', false);
       });
     }
   }),

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

@@ -94,13 +94,19 @@
             <label class="acc-label">{{t 'clusterNew.rke.ingress.label'}}</label>
             <div class="radio">
               <label>
-                {{radio-button selection=nginxIngressProvider value="nginx"}}
+                {{!--
+                    {{radio-button selection=nginxIngressProvider value="nginx"}}
+                    --}}
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="nginx"}}
                 {{t 'generic.enabled'}}
               </label>
             </div>
             <div class="radio">
               <label>
-                {{radio-button selection=nginxIngressProvider value=null}}
+                {{!--
+                    {{radio-button selection=nginxIngressProvider value=null}}
+                    --}}
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="none"}}
                 {{t 'generic.disabled'}}
               </label>
             </div>
@@ -109,13 +115,19 @@
             <label class="acc-label">{{t 'clusterNew.rke.monitoring.label'}}</label>
             <div class="radio">
               <label>
-                {{radio-button selection=monitoringProvider value="metrics-server"}}
+                {{!--
+                    {{radio-button selection=monitoringProvider value="metrics-server"}}
+                    --}}
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="metrics-server"}}
                 {{t 'generic.enabled'}}
               </label>
             </div>
             <div class="radio">
               <label>
-                {{radio-button selection=monitoringProvider value=null}}
+                {{!--
+                    {{radio-button selection=monitoringProvider value=null}}
+                    --}}
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="none"}}
                 {{t 'generic.disabled'}}
               </label>
             </div>
@@ -124,7 +136,10 @@
             <label class="acc-label">{{t 'clusterNew.rke.podSecurityPolicy.label'}}</label>
             <div class="radio">
               <label class={{unless model.psps.length 'text-muted'}}>
-                {{radio-button selection=kubeApiPodSecurityPolicy value=true disabled=(not model.psps.length)}}
+                {{!--
+                    {{radio-button selection=kubeApiPodSecurityPolicy value=true disabled=(not model.psps.length)}}
+                    --}}
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=true disabled=(not model.psps.length)}}
                 {{t 'generic.enabled'}}
                 {{#unless model.psps.length}}
                   &mdash; {{t 'clusterNew.psp.none'}}
@@ -133,7 +148,10 @@
             </div>
             <div class="radio">
               <label>
-                {{radio-button selection=kubeApiPodSecurityPolicy value=false disabled=(not model.psps.length)}}
+                {{!--
+                    {{radio-button selection=kubeApiPodSecurityPolicy value=false disabled=(not model.psps.length)}}
+                    --}}
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=false disabled=(not model.psps.length)}}
                 {{t 'generic.disabled'}}
               </label>
             </div>

lib/shared/addon/utils/constants.js

@@ -483,7 +483,7 @@ var C = {
 
     API_HOST:                  'api-host',
     CA_CERTS:                  'cacerts',
-    CLUSTER_DEFAULTS:          'cluster-defaults',
+    // CLUSTER_DEFAULTS:          'cluster-defaults',
     ENGINE_URL:                'engine-install-url',
     ENGINE_ISO_URL:            'engine-iso-url',
     FIRST_LOGIN:               'first-login',
@@ -517,7 +517,7 @@ var C = {
 
 C.SETTING.ALLOWED = {
   [C.SETTING.CA_CERTS]:          { kind: 'multiline' },
-  [C.SETTING.CLUSTER_DEFAULTS]:  { kind: 'json' },
+  // [C.SETTING.CLUSTER_DEFAULTS]:  { kind: 'json' },
   [C.SETTING.ENGINE_URL]:        {},
   [C.SETTING.ENGINE_ISO_URL]:    {},
   [C.SETTING.PL]:                {},