Skip to content

Commit 2caaa89

Browse files
chenopiszacharysarah
authored andcommitted
v1.9 patch (kubernetes#6690)
* Merge branch 'master' of https://github.com/kubernetes/website into release-1.9 * 'master' of https://github.com/kubernetes/website: [maintenance] December link fixes (kubernetes#6680) Update audit.md (kubernetes#6381) Fixed typo concepts/policy/pod-security-policy.md: fix broken links. Fixed a typo `illgal` Add glossory entry for ReplicaSet # Conflicts: # docs/concepts/policy/pod-security-policy.md # docs/tasks/debug-application-cluster/audit.md * Spelling correction and sentence capitalization. - Corrected the spelling error for storing, was put in as 'stoing'. - Capitalized list items. - Added '.' at end of sentences in the list items. * Workaround for Jekyllr frontmatter * fix typo * Update access-cluster.md with a comment that for IPv6 the user should use [::1] for the localhost
1 parent d97f7ab commit 2caaa89

File tree

20 files changed

+565
-257
lines changed

20 files changed

+565
-257
lines changed

cn/docs/tutorials/stateful-application/web.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: v1
32
kind: Service
43
metadata:

cn/docs/tutorials/stateful-application/webp.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: v1
32
kind: Service
43
metadata:
@@ -42,4 +41,4 @@ spec:
4241
accessModes: [ "ReadWriteOnce" ]
4342
resources:
4443
requests:
45-
storage: 1Gi
44+
storage: 1Gi

cn/docs/user-guide/multi-pod.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: v1
32
kind: Pod
43
metadata:

docs/concepts/api-extension/custom-resources.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,24 @@ When creating a new API, consider whether to [aggregate your API with the Kubern
4848
#### Declarative APIs
4949

5050
In a Declarative API, typically:
51-
- your API consists of a relatively small number of relatively small objects (resources).
52-
- the objects define configuration of applications or infrastructure
53-
- the objects are updated relatively infrequently
54-
- humans often need to read and write the objects
55-
- the main operations on the objects are CRUD-y (creating, reading, updating and deleting)
56-
- transactions across objects are not required: the API represents a desired state, not an exact state.
51+
- Your API consists of a relatively small number of relatively small objects (resources).
52+
- The objects define configuration of applications or infrastructure.
53+
- The objects are updated relatively infrequently.
54+
- Humans often need to read and write the objects.
55+
- The main operations on the objects are CRUD-y (creating, reading, updating and deleting).
56+
- Transactions across objects are not required: the API represents a desired state, not an exact state.
5757

5858
Imperative APIs are not declarative.
5959
Signs that your API might not be declarative include:
60-
- the client says "do this", and then gets a synchornous response back when it is done.
61-
- the client says "do this", and then gets an operation ID back, and has to check a separate Operation objects to determine completion of the request.
62-
- you talk about Remote Procedure Calls (RPCs)
63-
- directly stoing large amounts of data (e.g. > a few kB per object, or >1000s of objects)
64-
- high bandwidth access (10s of requests per second sustained) needed
65-
- store end-user data (such as images, PII, etc) or other large-scale data processed by applications
66-
- the natural operations on the objects are not CRUD-y.
67-
- the API is not easily modeled as objects.
68-
- you chose to represent pending operations with an operation ID or operation object.
60+
- The client says "do this", and then gets a synchornous response back when it is done.
61+
- The client says "do this", and then gets an operation ID back, and has to check a separate Operation objects to determine completion of the request.
62+
- You talk about Remote Procedure Calls (RPCs).
63+
- Directly storing large amounts of data (e.g. > a few kB per object, or >1000s of objects).
64+
- High bandwidth access (10s of requests per second sustained) needed.
65+
- Store end-user data (such as images, PII, etc) or other large-scale data processed by applications.
66+
- The natural operations on the objects are not CRUD-y.
67+
- The API is not easily modeled as objects.
68+
- You chose to represent pending operations with an operation ID or operation object.
6969

7070
### Should I use a configMap or a custom resource?
7171

@@ -102,7 +102,7 @@ Aggregated APIs are subordinate APIServers that sit behind the primary API serve
102102

103103
Custom Resource Definitions (CRDS) allow users to create new types of resources without adding another APIserver. You do not need to understand API Aggregation to use CRDs.
104104

105-
Regardless of whether they are installed via CRDs or AA, the new resources are called Custom Resources to distinguish them from built-in Kubernetes resources (like pods)
105+
Regardless of whether they are installed via CRDs or AA, the new resources are called Custom Resources to distinguish them from built-in Kubernetes resources (like pods).
106106

107107
## CustomResourceDefinitions
108108

@@ -215,9 +215,9 @@ Kubernetes [client libraries](/docs/reference/client-libraries/) can be used to
215215

216216
When you add a custom resource, you can access it using:
217217
- kubectl
218-
- the kubernetes dynamic client
219-
- a REST client that you write
220-
- a client generated using Kubernetes client generation tools (generating one is an advanced undertaking, but some projects may provide a client along with the CRD or AA).
218+
- The kubernetes dynamic client.
219+
- A REST client that you write.
220+
- A client generated using Kubernetes client generation tools (generating one is an advanced undertaking, but some projects may provide a client along with the CRD or AA).
221221

222222
{% endcapture %}
223223

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
apiVersion: extensions/v1beta1
22
kind: PodSecurityPolicy
33
metadata:
4-
name: permissive
4+
name: example
55
spec:
6+
privileged: false # Don't allow privileged pods!
7+
# The rest fills in some required fields.
68
seLinux:
79
rule: RunAsAny
810
supplementalGroups:
@@ -11,10 +13,5 @@ spec:
1113
rule: RunAsAny
1214
fsGroup:
1315
rule: RunAsAny
14-
hostPorts:
15-
- min: 8000
16-
max: 8080
1716
volumes:
1817
- '*'
19-
allowedCapabilities:
20-
- '*'

0 commit comments

Comments
 (0)