Skip to content

Commit b27eb32

Browse files
committed
Merge pull request #301 from GertiPoppel/userdoc
Provide first links for Learn more
2 parents c4caa39 + 97deecd commit b27eb32

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

src/app/frontend/deploy/createsecret.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<md-dialog-content layout-padding>
1919
<h4 class="md-title">Create a new image pull secret</h4>
2020
<div>The new secret will be added to the cluster.</div>
21+
2122
<form name="ctrl.secretForm" ng-submit="ctrl.createSecret()" novalidate>
2223
<kd-help-section>
2324
<md-input-container class="md-block" layout-wrap>
@@ -33,9 +34,10 @@ <h4 class="md-title">Create a new image pull secret</h4>
3334
</md-input-container>
3435
<kd-user-help>
3536
A secret with the specified name will be added to the cluster in the namespace <span class="kd-emphasized">{{ctrl.namespace}}.</span>
36-
<a href="">Learn more</a>
37+
<a href="http://kubernetes.io/v1.1/docs/user-guide/secrets.html">Learn more</a>
3738
</kd-user-help>
3839
</kd-help-section>
40+
3941
<kd-help-section>
4042
<md-input-container class="md-block" layout-wrap>
4143
<label>Image pull secret data</label>
@@ -49,9 +51,10 @@ <h4 class="md-title">Create a new image pull secret</h4>
4951
<kd-user-help>
5052
Specify the data for your secret to hold. The value is the Base64 encoded content of a
5153
.dockercfg file.
52-
<a href="">Learn more</a>
54+
<a href="http://kubernetes.io/v1.1/docs/user-guide/images.html#specifying-imagepullsecrets-on-a-pod">Learn more</a>
5355
</kd-user-help>
5456
</kd-help-section>
57+
5558
<md-dialog-actions layout="row">
5659
<md-button class="md-primary" type="submit">Create</md-button>
5760
<md-button ng-click="ctrl.cancel()">Cancel</md-button>

src/app/frontend/deploy/deployfromsettings.html

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
</ng-messages>
3131
</md-input-container>
3232
<kd-user-help>
33-
An 'app' label with this value will be added to the Replica Set and Service that get deployed.
33+
An 'app' label with this value will be added to the Replication Controller and Service that get deployed.
34+
<a href="http://kubernetes.io/v1.1/docs/user-guide/labels.html">Learn more</a>
3435
</kd-user-help>
3536
</kd-help-section>
3637

@@ -45,7 +46,7 @@
4546
<kd-user-help>
4647
Enter the URL of a public image on any registry, or a private image hosted on Docker Hub or
4748
Google Container Registry.
48-
<a href="">Learn more</a>
49+
<a href="http://kubernetes.io/v1.1/docs/user-guide/images.html">Learn more</a>
4950
</kd-user-help>
5051
</kd-help-section>
5152

@@ -59,8 +60,8 @@
5960
</ng-messages>
6061
</md-input-container>
6162
<kd-user-help>
62-
A Replica Set will be created to maintain the desired number of pods across your cluster.
63-
<a href="">Learn more</a>
63+
A Replication Controller will be created to maintain the desired number of pods across your cluster.
64+
<a href="http://kubernetes.io/v1.1/docs/user-guide/replication-controller.html">Learn more</a>
6465
</kd-user-help>
6566
</kd-help-section>
6667

@@ -74,7 +75,7 @@
7475
<span ng-if="ctrl.name">
7576
The internal DNS name for this Service will be: <span class="kd-emphasized">{{ctrl.name}}</span>.
7677
</span>
77-
<a href="">Learn more</a>
78+
<a href="http://kubernetes.io/v1.1/docs/user-guide/services.html">Learn more</a>
7879
</kd-user-help>
7980
</kd-help-section>
8081

@@ -92,7 +93,7 @@
9293
<textarea ng-model="ctrl.description"></textarea>
9394
</md-input-container>
9495
<kd-user-help>
95-
The description will be added as an annotation to the Replica Set and displayed in the
96+
The description will be added as an annotation to the Replication Controller and displayed in the
9697
application's details.
9798
</kd-user-help>
9899
</kd-help-section>
@@ -111,9 +112,9 @@
111112
</div>
112113
</div>
113114
<kd-user-help>
114-
The specified labels will be applied to the created Replica Set, Service (if any) and Pods.
115+
The specified labels will be applied to the created Replication Controller, Service (if any) and Pods.
115116
Common labels include release, environment, tier, partition and track.
116-
<a href="">Learn more</a>
117+
<a href="http://kubernetes.io/v1.1/docs/user-guide/labels.html">Learn more</a>
117118
</kd-user-help>
118119
</kd-help-section>
119120

@@ -131,7 +132,7 @@
131132
</md-input-container>
132133
<kd-user-help>
133134
Namespaces let you partition resources into logically named groups.
134-
<a href="">Learn more</a>
135+
<a href="http://kubernetes.io/v1.1/docs/admin/namespaces.html">Learn more</a>
135136
</kd-user-help>
136137
</kd-help-section>
137138

@@ -150,7 +151,7 @@
150151
<kd-user-help>
151152
The specified image could require a pull secret credential if it is private. You may choose an
152153
existing secret or create a new one.
153-
<a href="">Learn more</a>
154+
<a href="http://kubernetes.io/v1.1/docs/user-guide/secrets.html">Learn more</a>
154155
</kd-user-help>
155156
</kd-help-section>
156157

@@ -160,22 +161,22 @@
160161
<label>CPU requirement (cores)</label>
161162
<input ng-model="ctrl.cpuRequirement" type="number" name="cpuRequirement" min="0">
162163
<ng-messages for="ctrl.form.cpuRequirement.$error" role="alert" multiple>
163-
<ng-message when="number">CPU requirement must be a valid number.</ng-message>
164-
<ng-message when="min">CPU requirement must be positive.</ng-message>
164+
<ng-message when="number">CPU requirement must be given as a valid number.</ng-message>
165+
<ng-message when="min">CPU requirement must be given as a positive number.</ng-message>
165166
</ng-messages>
166167
</md-input-container>
167168
<md-input-container flex>
168169
<label>Memory requirement (MiB)</label>
169170
<input ng-model="ctrl.memoryRequirement" type="number" name="memoryRequirement" min="0">
170171
<ng-messages for="ctrl.form.memoryRequirement.$error" role="alert" multiple>
171-
<ng-message when="number">Memory requirement must be a valid number.</ng-message>
172-
<ng-message when="min">Memory requirement must be positive.</ng-message>
172+
<ng-message when="number">Memory requirement must be given as a valid number.</ng-message>
173+
<ng-message when="min">Memory requirement must be given as a positive number.</ng-message>
173174
</ng-messages>
174175
</md-input-container>
175176
</div>
176177
<kd-user-help>
177178
You can specify minimum CPU and memory requirements for the container.
178-
<a href="">Learn more</a>
179+
<a href="http://kubernetes.io/v1.1/docs/admin/limitrange/README.html">Learn more</a>
179180
</kd-user-help>
180181
</kd-help-section>
181182

@@ -194,7 +195,7 @@
194195
<kd-user-help>
195196
By default, your containers run the selected image's default entrypoint command. You can
196197
use the command options to override the default.
197-
<a href="">Learn more</a>
198+
<a href="http://kubernetes.io/v1.1/docs/user-guide/containers.html">Learn more</a>
198199
</kd-user-help>
199200
</kd-help-section>
200201

@@ -203,7 +204,7 @@
203204
Run as privileged
204205
</md-switch>
205206
<kd-user-help>
206-
Processes in privileged containers are equivalent to be running as root on the host.
207+
Processes in privileged containers are equivalent to processes running as root on the host.
207208
</kd-user-help>
208209
</kd-help-section>
209210
</div>

src/app/frontend/deploy/upload.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
</div>
3939
<kd-user-help>
4040
Select a YAML or JSON file, specifying the resources to deploy.
41-
<a href="">Learn more</a>
41+
<a href="http://kubernetes.io/v1.1/docs/user-guide/kubectl/kubectl_create.html">Learn more</a>
4242
</kd-user-help>
4343
</kd-help-section>

src/app/frontend/replicasetdetail/replicasetdetail.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ <h1 flex class="md-title kd-replicasetdetail-app-name">
151151
<kd-sorted-header currently-selected-column="ctrl.sortPodsBy"
152152
currently-selected-order="ctrl.podsOrder"
153153
column-name="restartCount"
154-
tooltip="Restarts count and last restart time of the pod">
154+
tooltip="Number of restarts and last restart time of the pod">
155155
Restarts
156156
</kd-sorted-header>
157157
</th>
158158
<th class="kd-replicasetdetail-table-header">
159159
<kd-sorted-header currently-selected-column="ctrl.sortPodsBy"
160160
currently-selected-order="ctrl.podsOrder"
161-
column-name="startTime" tooltip="Age of the pod">
161+
column-name="startTime" tooltip="Time the pod was last started">
162162
Age
163163
</kd-sorted-header>
164164
</th>
@@ -179,15 +179,15 @@ <h1 flex class="md-title kd-replicasetdetail-app-name">
179179
<th class="kd-replicasetdetail-table-header">
180180
<kd-sorted-header currently-selected-column="ctrl.sortPodsBy"
181181
currently-selected-order="ctrl.podsOrder"
182-
column-name="podIP" tooltip="In cluster IP adress of the pod">
182+
column-name="podIP" tooltip="IP adress of the pod in the cluster">
183183
Cluster IP
184184
</kd-sorted-header>
185185
</th>
186186
<th class="kd-replicasetdetail-table-header">
187187
<kd-sorted-header currently-selected-column="ctrl.sortPodsBy"
188188
currently-selected-order="ctrl.podsOrder"
189189
column-name="nodeName"
190-
tooltip="Name of the node, that the pod is running on">
190+
tooltip="Name of the node the pod is running on">
191191
Node
192192
</kd-sorted-header>
193193
</th>
@@ -298,23 +298,23 @@ <h1 flex class="md-title kd-replicasetdetail-app-name">
298298
<kd-sorted-header currently-selected-column="ctrl.sortEventsBy"
299299
currently-selected-order="ctrl.eventsOrder"
300300
column-name="count"
301-
tooltip="Number of times, that the event occured">
301+
tooltip="Number of times the event occurred">
302302
Count
303303
</kd-sorted-header>
304304
</th>
305305
<th class="kd-replicasetdetail-table-header">
306306
<kd-sorted-header currently-selected-column="ctrl.sortEventsBy"
307307
currently-selected-order="ctrl.eventsOrder"
308308
column-name="firstSeen"
309-
tooltip="When the event was seen for the first time">
309+
tooltip="Time the event was seen for the first time">
310310
First seen
311311
</kd-sorted-header>
312312
</th>
313313
<th class="kd-replicasetdetail-table-header">
314314
<kd-sorted-header currently-selected-column="ctrl.sortEventsBy"
315315
currently-selected-order="ctrl.eventsOrder"
316316
column-name="lastSeen"
317-
tooltip="When the event was seen for the last time">
317+
tooltip="Time the event was seen for the last time">
318318
Last seen
319319
</kd-sorted-header>
320320
</th>
@@ -341,7 +341,7 @@ <h1 flex class="md-title kd-replicasetdetail-app-name">
341341
</tr>
342342
</tbody>
343343
</table>
344-
344+
345345
<div class="kd-replicasetdetail-no-events" ng-if="!ctrl.hasEvents()">
346346
<md-icon class="material-icons kd-replicasetdetail-no-events-icon">info_outline</md-icon>
347347
<div class="kd-replicasetdetail-no-events-text">No events were found</div>

0 commit comments

Comments
 (0)