-
Notifications
You must be signed in to change notification settings - Fork 14.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge release 1.14 into 1.15. (#16439)
1. Confirm the document content is similar as en version. 2. Merge the zh release-1.14 version into 1.15 version 3. add the 1.14 all sample into 1.15 for template work. The build looks fine. - docs - concepts - architecture
- Loading branch information
1 parent
7c47a2e
commit c87a304
Showing
147 changed files
with
3,907 additions
and
65 deletions.
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
--- | ||
title: "Kubernetes 架构" | ||
weight: 30 | ||
--- |
382 changes: 317 additions & 65 deletions
382
content/zh/docs/concepts/architecture/cloud-controller.md
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
注意:这些测试是从 kubernetes 导入的代码实际上并不打算在存储库之外使用。 | ||
这就导致了供应商依赖问题。因此,我们必须在 travis 配置这些行: | ||
<!-- | ||
Note: These tests are importing code from kubernetes that isn't really | ||
meant to be used outside the repo. This causes vendoring problems. As | ||
a result, we have to work around those with these lines in the travis | ||
config: | ||
--> | ||
|
||
``` | ||
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery | ||
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver | ||
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go | ||
- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/ | ||
- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/* | ||
- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/ | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# This is an example of how to setup cloud-controller-manger as a Daemonset in your cluster. | ||
# It assumes that your masters can run pods and has the role node-role.kubernetes.io/master | ||
# Note that this Daemonset will not work straight out of the box for your cloud, this is | ||
# meant to be a guideline. | ||
|
||
--- | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: cloud-controller-manager | ||
namespace: kube-system | ||
--- | ||
kind: ClusterRoleBinding | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
metadata: | ||
name: system:cloud-controller-manager | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: ClusterRole | ||
name: cluster-admin | ||
subjects: | ||
- kind: ServiceAccount | ||
name: cloud-controller-manager | ||
namespace: kube-system | ||
--- | ||
apiVersion: apps/v1 | ||
kind: DaemonSet | ||
metadata: | ||
labels: | ||
k8s-app: cloud-controller-manager | ||
name: cloud-controller-manager | ||
namespace: kube-system | ||
spec: | ||
selector: | ||
matchLabels: | ||
k8s-app: cloud-controller-manager | ||
template: | ||
metadata: | ||
labels: | ||
k8s-app: cloud-controller-manager | ||
spec: | ||
serviceAccountName: cloud-controller-manager | ||
containers: | ||
- name: cloud-controller-manager | ||
# for in-tree providers we use k8s.gcr.io/cloud-controller-manager | ||
# this can be replaced with any other image for out-of-tree providers | ||
image: k8s.gcr.io/cloud-controller-manager:v1.8.0 | ||
command: | ||
- /usr/local/bin/cloud-controller-manager | ||
- --cloud-provider=<YOUR_CLOUD_PROVIDER> # Add your own cloud provider here! | ||
- --leader-elect=true | ||
- --use-service-account-credentials | ||
# these flags will vary for every cloud provider | ||
- --allocate-node-cidrs=true | ||
- --configure-cloud-routes=true | ||
- --cluster-cidr=172.17.0.0/16 | ||
tolerations: | ||
# this is required so CCM can bootstrap itself | ||
- key: node.cloudprovider.kubernetes.io/uninitialized | ||
value: "true" | ||
effect: NoSchedule | ||
# this is to have the daemonset runnable on master nodes | ||
# the taint may vary depending on your cluster setup | ||
- key: node-role.kubernetes.io/master | ||
effect: NoSchedule | ||
# this is to restrict CCM to only run on master nodes | ||
# the node selector may vary depending on your cluster setup | ||
nodeSelector: | ||
node-role.kubernetes.io/master: "" |
13 changes: 13 additions & 0 deletions
13
content/zh/examples/admin/cloud/pvl-initializer-config.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
kind: InitializerConfiguration | ||
apiVersion: admissionregistration.k8s.io/v1alpha1 | ||
metadata: | ||
name: pvlabel.kubernetes.io | ||
initializers: | ||
- name: pvlabel.kubernetes.io | ||
rules: | ||
- apiGroups: | ||
- "" | ||
apiVersions: | ||
- "*" | ||
resources: | ||
- persistentvolumes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: busybox | ||
namespace: default | ||
spec: | ||
containers: | ||
- name: busybox | ||
image: busybox:1.28 | ||
command: | ||
- sleep | ||
- "3600" | ||
imagePullPolicy: IfNotPresent | ||
restartPolicy: Always |
33 changes: 33 additions & 0 deletions
33
content/zh/examples/admin/dns/dns-horizontal-autoscaler.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: dns-autoscaler | ||
namespace: kube-system | ||
labels: | ||
k8s-app: dns-autoscaler | ||
spec: | ||
selector: | ||
matchLabels: | ||
k8s-app: dns-autoscaler | ||
template: | ||
metadata: | ||
labels: | ||
k8s-app: dns-autoscaler | ||
spec: | ||
containers: | ||
- name: autoscaler | ||
image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.1 | ||
resources: | ||
requests: | ||
cpu: "20m" | ||
memory: "10Mi" | ||
command: | ||
- /cluster-proportional-autoscaler | ||
- --namespace=kube-system | ||
- --configmap=dns-autoscaler | ||
- --target=<SCALE_TARGET> | ||
# When cluster is using large nodes(with more cores), "coresPerReplica" should dominate. | ||
# If using small nodes, "nodesPerReplica" should dominate. | ||
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"min":1}} | ||
- --logtostderr=true | ||
- --v=2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
"kind": "Namespace", | ||
"apiVersion": "v1", | ||
"metadata": { | ||
"name": "development", | ||
"labels": { | ||
"name": "development" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
"kind": "Namespace", | ||
"apiVersion": "v1", | ||
"metadata": { | ||
"name": "production", | ||
"labels": { | ||
"name": "production" | ||
} | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
content/zh/examples/admin/resource/quota-objects-pvc-2.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
kind: PersistentVolumeClaim | ||
apiVersion: v1 | ||
metadata: | ||
name: pvc-quota-demo-2 | ||
spec: | ||
storageClassName: manual | ||
accessModes: | ||
- ReadWriteOnce | ||
resources: | ||
requests: | ||
storage: 4Gi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
kind: PersistentVolumeClaim | ||
apiVersion: v1 | ||
metadata: | ||
name: pvc-quota-demo | ||
spec: | ||
storageClassName: manual | ||
accessModes: | ||
- ReadWriteOnce | ||
resources: | ||
requests: | ||
storage: 3Gi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
apiVersion: v1 | ||
kind: ResourceQuota | ||
metadata: | ||
name: object-quota-demo | ||
spec: | ||
hard: | ||
persistentvolumeclaims: "1" | ||
services.loadbalancers: "2" | ||
services.nodeports: "0" |
17 changes: 17 additions & 0 deletions
17
content/zh/examples/admin/resource/quota-pod-deployment.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: pod-quota-demo | ||
spec: | ||
selector: | ||
matchLabels: | ||
purpose: quota-demo | ||
replicas: 3 | ||
template: | ||
metadata: | ||
labels: | ||
purpose: quota-demo | ||
spec: | ||
containers: | ||
- name: pod-quota-demo | ||
image: nginx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
apiVersion: v1 | ||
kind: ResourceQuota | ||
metadata: | ||
name: pod-demo | ||
spec: | ||
hard: | ||
pods: "2" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: my-scheduler | ||
namespace: kube-system | ||
--- | ||
kind: ClusterRoleBinding | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
metadata: | ||
name: my-scheduler-as-kube-scheduler | ||
subjects: | ||
- kind: ServiceAccount | ||
name: my-scheduler | ||
namespace: kube-system | ||
roleRef: | ||
kind: ClusterRole | ||
name: kube-scheduler | ||
apiGroup: rbac.authorization.k8s.io | ||
--- | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
labels: | ||
component: scheduler | ||
tier: control-plane | ||
name: my-scheduler | ||
namespace: kube-system | ||
spec: | ||
selector: | ||
matchLabels: | ||
component: scheduler | ||
tier: control-plane | ||
replicas: 1 | ||
template: | ||
metadata: | ||
labels: | ||
component: scheduler | ||
tier: control-plane | ||
version: second | ||
spec: | ||
serviceAccountName: my-scheduler | ||
containers: | ||
- command: | ||
- /usr/local/bin/kube-scheduler | ||
- --address=0.0.0.0 | ||
- --leader-elect=false | ||
- --scheduler-name=my-scheduler | ||
image: gcr.io/my-gcp-project/my-kube-scheduler:1.0 | ||
livenessProbe: | ||
httpGet: | ||
path: /healthz | ||
port: 10251 | ||
initialDelaySeconds: 15 | ||
name: kube-second-scheduler | ||
readinessProbe: | ||
httpGet: | ||
path: /healthz | ||
port: 10251 | ||
resources: | ||
requests: | ||
cpu: '0.1' | ||
securityContext: | ||
privileged: false | ||
volumeMounts: [] | ||
hostNetwork: false | ||
hostPID: false | ||
volumes: [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: no-annotation | ||
labels: | ||
name: multischeduler-example | ||
spec: | ||
containers: | ||
- name: pod-with-no-annotation-container | ||
image: k8s.gcr.io/pause:2.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: annotation-default-scheduler | ||
labels: | ||
name: multischeduler-example | ||
spec: | ||
schedulerName: default-scheduler | ||
containers: | ||
- name: pod-with-default-annotation-container | ||
image: k8s.gcr.io/pause:2.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: annotation-second-scheduler | ||
labels: | ||
name: multischeduler-example | ||
spec: | ||
schedulerName: my-scheduler | ||
containers: | ||
- name: pod-with-second-annotation-container | ||
image: k8s.gcr.io/pause:2.0 |
12 changes: 12 additions & 0 deletions
12
content/zh/examples/application/cassandra/cassandra-service.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
labels: | ||
app: cassandra | ||
name: cassandra | ||
spec: | ||
clusterIP: None | ||
ports: | ||
- port: 9042 | ||
selector: | ||
app: cassandra |
Oops, something went wrong.