diff --git a/lib/global-admin/addon/clusters/new/rke/controller.js b/lib/global-admin/addon/clusters/new/rke/controller.js index e09963fba..a9460e89e 100644 --- a/lib/global-admin/addon/clusters/new/rke/controller.js +++ b/lib/global-admin/addon/clusters/new/rke/controller.js @@ -84,6 +84,7 @@ export default Controller.extend(ACC, { searchText: '', authChoices: AUTH, networkChoices: NETWORK, + versionChoices: [], createNodes: true, registry: 'default', diff --git a/lib/global-admin/addon/clusters/new/rke/route.js b/lib/global-admin/addon/clusters/new/rke/route.js index b18862888..f93c33b20 100644 --- a/lib/global-admin/addon/clusters/new/rke/route.js +++ b/lib/global-admin/addon/clusters/new/rke/route.js @@ -16,6 +16,25 @@ export default Ember.Route.extend({ options: [], plugin:'flannel', }, + ignoreDockerVersion: true, + services: { + kubeApi: { + serviceClusterIpRange: '10.233.0.0/18', + podSecurityPolicy: false, + extraArgs: { + v: '4', + } + }, + kubeController: { + clusterCidr: '10.233.64.0/18', + serviceClusterIpRange: '10.233.0.0/18', + }, + kubelet: { + clusterDnsServer: '10.233.0.3', + clusterDomain: 'cluster.local', + infraContainerImage: 'gcr.io/google_containers/pause-amd64:3.0', + }, + }, authentication: { options: [], strategy: 'x509', diff --git a/lib/global-admin/addon/clusters/new/rke/template.hbs b/lib/global-admin/addon/clusters/new/rke/template.hbs index 64b06df71..6be439f65 100644 --- a/lib/global-admin/addon/clusters/new/rke/template.hbs +++ b/lib/global-admin/addon/clusters/new/rke/template.hbs @@ -176,6 +176,61 @@ + + {{#advanced-section}} +
+
+ +
+ +
+
+ +
+
+
+ +
+
+ +
+ + {{input type="text" value=config.services.kubelet.infraContainerImage}} + + {{input type="text" value=config.services.kubelet.clusterDomain}} + + {{input type="text" value=config.services.kubelet.clusterDnsServer}} +
+
+
+
+
+ +
+ + {{input type="text" value=config.services.kubeController.serviceClusterIpRange}} + + {{input type="text" value=config.services.kubeController.clusterCidr}} +
+
+
+
+
+ +
+ + {{input type="text" value=config.services.kubeApi.serviceClusterIpRange}} + +
+ +
+
+ +
+
+
+
+ {{/advanced-section}} {{/accordion-list-item}} {{/accordion-list}} diff --git a/translations/en-us.yaml b/translations/en-us.yaml index d3c0b6fca..82976fd38 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -723,6 +723,8 @@ clustersPage: label: Pull Kubernetes Images From default: The default registry (DockerHub) custom: "A custom registry:" + ignoreDockerVersion: + label: Allow Unsupported Docker Versions headers: labels: etcd: Use for etcd @@ -732,6 +734,19 @@ clustersPage: customize: label: Customize detail: "Optional configuration options for the Kubernetes installation" + kubeApi: + label: Kube API + ipRange: Service Cluster IP Range + podSecurityPolicy: Pod Security Policy + kubeController: + label: Kube Controller + cidr: Cluster CIDR + ipRange: Service Cluster IP Range + kubelet: + label: Kubelet + domain: Cluster Domain + dns: Cluster DNS Server + infra: Pod Infra Container Image requirements: label: "Number of nodes required:" cluster: Exactly 1, 3, or 5