You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: docs/clusterdefinition.md
+87-1
Original file line number
Diff line number
Diff line change
@@ -41,7 +41,93 @@ Here are the valid values for the orchestrator types:
41
41
|maxPods|no|The maximum number of pods per node. The minimum valid value, necessary for running kube-system pods, is 5. Default value is 30 when networkPolicy equals azure, 110 otherwise.|
42
42
|gcHighThreshold|no|Sets the --image-gc-high-threshold value on the kublet configuration. Default is 85. [See kubelet Garbage Collection](https://kubernetes.io/docs/concepts/cluster-administration/kubelet-garbage-collection/)|
43
43
|gcLowThreshold|no|Sets the --image-gc-low-threshold value on the kublet configuration. Default is 80. [See kubelet Garbage Collection](https://kubernetes.io/docs/concepts/cluster-administration/kubelet-garbage-collection/)|
44
-
|disabledAddons.dashboard|no|Disable dashboard addon (boolean - default == false, i.e. not disabled)|
44
+
|useInstanceMetadata|no|Use the Azure cloudprovider instance metadata service for appropriate resource discovery operations. Default is `true`.|
45
+
|addons|no|Configure various Kubernetes addons configuration (currently supported: tiller, kubernetes-dashboard). See `addons` configuration below.|
46
+
47
+
`addons` describes various addons configuration. It is a child property of `kubernetesConfig`. Below is a list of currently available addons:
48
+
49
+
|Name of addon|Enabled by default?|How many containers|Description|
50
+
|tiller|true|Delivers the Helm server-side component: tiller. See https://github.com/kubernetes/helm for more info.|
51
+
|kubernetes-dashboard|true|1|Delivers the kubernetes dashboard component. See https://github.com/kubernetes/dashboard for more info.|
52
+
53
+
To give a bit more info on the `addons` property: We've tried to expose the basic bits of data that allow useful configuration of these cluster features. Here are some example usage patterns that will unpack what `addons` provide:
54
+
55
+
To enable an addon (using "tiller" as an example):
56
+
57
+
```
58
+
"kubernetesConfig": {
59
+
"addons": [
60
+
{
61
+
"name": "tiller",
62
+
"enabled" : true
63
+
}
64
+
]
65
+
}
66
+
```
67
+
68
+
As you can see above, `addons` is an array child property of `kubernetesConfig`. Each addon that you want to add custom configuration to would be represented as an object item in the array. For example, to disable both tiller and dashboard:
69
+
70
+
```
71
+
"kubernetesConfig": {
72
+
"addons": [
73
+
{
74
+
"name": "tiller",
75
+
"enabled" : false
76
+
},
77
+
{
78
+
"name": "dashboard",
79
+
"enabled" : false
80
+
}
81
+
]
82
+
}
83
+
```
84
+
85
+
More usefully, let's add some custom configuration to both of the above addons:
86
+
87
+
```
88
+
"kubernetesConfig": {
89
+
"addons": [
90
+
{
91
+
"name": "tiller",
92
+
"containers": [
93
+
{
94
+
"name": "tiller",
95
+
"image": "myDockerHubUser/tiller:v3.0.0-alpha
96
+
"cpuRequests": "1",
97
+
"memoryRequests": "1024Mi",
98
+
"cpuLimits": "1",
99
+
"memoryLimits": "1024Mi"
100
+
}
101
+
]
102
+
},
103
+
{
104
+
"name": "kubernetes-dashboard",
105
+
"containers": [
106
+
{
107
+
"name": "kubernetes-dashboard",
108
+
"cpuRequests": "50m",
109
+
"memoryRequests": "512Mi",
110
+
"cpuLimits": "50m",
111
+
"memoryLimits": "512Mi"
112
+
}
113
+
]
114
+
}
115
+
]
116
+
}
117
+
```
118
+
119
+
Above you see custom configuration for both tiller and kubernetes-dashboard. Both include specific resource limit values across the following dimensions:
120
+
121
+
- cpuRequests
122
+
- memoryRequests
123
+
- cpuLimits
124
+
- memoryLimits
125
+
126
+
See https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ for more on Kubernetes resource limits.
127
+
128
+
Additionally above, we specified a custom docker image for tiller, let's say we want to build a cluster and test an alpha version of tiller in it.
129
+
130
+
Finally, the `addons.enabled` boolean property was omitted above; that's by design. If you specify a `containers` configuration, acs-engine assumes you're enabling the addon. The very first example above demonstrates a simple "enable this addon with default configuration" declaration.
45
131
46
132
### masterProfile
47
133
`masterProfile` describes the settings for master configuration.
1.`git cherry-pick c674a16f74782b326f02345486b5f9520891f395` (This works around the [open issue](https://github.com/kubernetes/Heapster/issues/1783) with Grafana deployments currently)
1. We need to configure Heapster to use InfluxDB as the the data store. To do that under the spec > containers > command property change the command field from:
82
+
83
+
We need to configure Heapster to use InfluxDB as the the data store. To do that under the spec > containers > command property change the command field from:
Copy file name to clipboardexpand all lines: docs/kubernetes/windows.md
+1-1
Original file line number
Diff line number
Diff line change
@@ -46,7 +46,7 @@ Once your Kubernetes cluster has been created you will have a resource group con
46
46
47
47
1. 1 master accessible by SSH on port 22 or kubectl on port 443
48
48
49
-
2. a set of windows and linux nodes. The windows nodes can be accessed through an RDP SSH tunnel via the master node. To do this, follow these [instructions](../ssh.md#create-port-80-tunnel-to-the-master), replacing port 80 with 3389. Since your windows machine is already using port 3389, it is recommended to use 3390 to Windows Node 0, 10.240.245.5, 3391 to Windows Node 1, 10.240.245.6, and so on as shown in the following image:
49
+
2. a set of windows and linux nodes. The windows nodes can be accessed through an RDP SSH tunnel via the master node. To do this, follow these [instructions](../ssh.md#ssh-to-the-machine), replacing port 80 with 3389. Since your windows machine is already using port 3389, it is recommended to use 3390 to Windows Node 0, 10.240.0.4, 3391 to Windows Node 1, 10.240.0.5, and so on as shown in the following image:
50
50
51
51
Copy file name to clipboardexpand all lines: docs/ssh.md
+8-8
Original file line number
Diff line number
Diff line change
@@ -38,21 +38,21 @@ Pageant enables agent forwarding. This means that you can SSH from any of the m
38
38
39
39
The DC/OS admin router requires an SSH tunnel from port 80 to port 80.
40
40
41
-
1. Verify you have nothing listening on port 80:
41
+
###Verify you have nothing listening on port 80:
42
42
1. on linux or Mac type `sudo netstat -anpe | grep ":80"` and stop any service or process listening on port 80
43
43
2. on windows, at the command prompt type `netstat -ano | findstr /c:":80"` and stop any service or process listening on port 80.
44
44
45
-
2. Get the "sshMaster0" command:
45
+
###Get the "sshMaster0" command:
46
46
1. If using Powershell or CLI, the output parameters are the last values printed
47
47
2. If using Portal, to get the output you need to:
48
-
1. navigate to "resource group"
49
-
2. click on the resource group you just created
50
-
3. then click on "Succeeded" under *last deployment*
51
-
4. then click on the "Microsoft.Template"
52
-
5. now you can copy the output of "sshMaster0"
48
+
1. navigate to "resource group"
49
+
2. click on the resource group you just created
50
+
3. then click on "Succeeded" under *last deployment*
51
+
4. then click on the "Microsoft.Template"
52
+
5. now you can copy the output of "sshMaster0"
53
53
54
54
55
-
2. SSH to the machine
55
+
###SSH to the machine
56
56
1. on linux or Mac, modify the ssh command from "sshMaster0", and add `-L 80:localhost:80`, then use that command to connect
57
57
2. on Windows, open Putty and in addition to the instructions from [agent forwarding](#key-management-and-agent-forwarding-with-windows-pageant), browse to Connection->SSH->Tunnel and add "80" to Source Port and "localhost:80" to Destination.
58
58
0 commit comments