sync zh/ en/ (#19918)

2020-03-28 19:57:52 +08:00
parent 59cd0289fe
commit 2a8ad5e658
38 changed files with 1059 additions and 934 deletions
@@ -1,6 +1,6 @@
 {
-  "kind": "Namespace",
  "apiVersion": "v1",
+  "kind": "Namespace",
  "metadata": {
    "name": "development",
    "labels": {
@@ -1,6 +1,6 @@
 {
-  "kind": "Namespace",
  "apiVersion": "v1",
+  "kind": "Namespace",
  "metadata": {
    "name": "production",
    "labels": {
@@ -13,4 +13,3 @@ spec:
      requests:
        memory: "700Mi"
        cpu: "400m"
-
@@ -13,4 +13,3 @@ spec:
      requests:
        memory: "600Mi"
        cpu: "400m"
-
@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: snowflake
+  name: snowflake
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: snowflake
+  template:
+    metadata:
+      labels:
+        app: snowflake
+    spec:
+      containers:
+      - image: k8s.gcr.io/serve_hostname
+        imagePullPolicy: Always
+        name: snowflake
@@ -1,5 +1,5 @@
 # Specify BROKER_URL and QUEUE when running
-FROM ubuntu:14.04
+FROM ubuntu:18.04

 RUN apt-get update && \
    apt-get install -y curl ca-certificates amqp-tools python \
@@ -3,5 +3,5 @@
 # Just prints standard out and sleeps for 10 seconds.
 import sys
 import time
-print("Processing " + sys.stdin.lines())
+print("Processing " + sys.stdin.readlines()[0])
 time.sleep(10)
@@ -111,7 +111,7 @@ class RedisWQ(object):
        # If we crash here, then the GC code will try to move the value, but it will
        # not be here, which is fine.  So this does not need to be a transaction.
        itemkey = self._itemkey(value)
-        self._db.delete(self._lease_key_prefix + itemkey, self._session)
+        self._db.delete(self._lease_key_prefix + itemkey)

 # TODO: add functions to clean up all keys associated with "name" when
 # processing is complete.
@@ -14,7 +14,7 @@ print("Initial queue state: empty=" + str(q.empty()))
 while not q.empty():
  item = q.lease(lease_secs=10, block=True, timeout=2) 
  if item is not None:
-    itemstr = item.decode("utf=8")
+    itemstr = item.decode("utf-8")
    print("Working on " + itemstr)
    time.sleep(10) # Put your actual work here instead of sleep.
    q.complete(item)
@@ -0,0 +1,39 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: php-apache
+spec:
+  selector:
+    matchLabels:
+      run: php-apache
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        run: php-apache
+    spec:
+      containers:
+      - name: php-apache
+        image: k8s.gcr.io/hpa-example
+        ports:
+        - containerPort: 80
+        resources:
+          limits:
+            cpu: 500m
+          requests:
+            cpu: 200m
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: php-apache
+  labels:
+    run: php-apache
+spec:
+  ports:
+  - port: 80
+  selector:
+    run: php-apache
+
@@ -34,8 +34,6 @@ import (
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/apis/admissionregistration"
-	ar_validation "k8s.io/kubernetes/pkg/apis/admissionregistration/validation"
 	"k8s.io/kubernetes/pkg/apis/apps"
 	apps_validation "k8s.io/kubernetes/pkg/apis/apps/validation"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
@@ -434,12 +432,6 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"node-problem-detector-configmap": {&apps.DaemonSet{}},
 			"termination":                     {&api.Pod{}},
 		},
-		"federation": {
-			"policy-engine-deployment":    {&apps.Deployment{}},
-			"policy-engine-service":       {&api.Service{}},
-			"replicaset-example-policy":   {&apps.ReplicaSet{}},
-			"scheduling-policy-admission": {&api.ConfigMap{}},
-		},
 		"podpreset": {
 			"allow-db":          {&settings.PodPreset{}},
 			"allow-db-merged":   {&api.Pod{}},
@@ -569,8 +561,6 @@ func TestExampleObjectSchemas(t *testing.T) {
 	capabilities.SetForTests(capabilities.Capabilities{
 		AllowPrivileged: true,
 	})
-	// PodShareProcessNamespace needed for example share-process-namespace.yaml
-	utilfeature.DefaultFeatureGate.Set("PodShareProcessNamespace=true")

 	for dir, expected := range cases {
 		tested := 0
@@ -1,4 +1,4 @@
 FROM node:6.14.2
 EXPOSE 8080
 COPY server.js .
-CMD node server.js
+CMD [ "node", "server.js" ]
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: nginx
+  labels:
+    env: test
+spec:
+  containers:
+  - name: nginx
+    image: nginx
+    imagePullPolicy: IfNotPresent
+  tolerations:
+  - key: "example-key"
+    operator: "Exists"
+    effect: "NoSchedule"
@@ -0,0 +1,11 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: allow-all-egress
+spec:
+  podSelector: {}
+  egress:
+  - {}
+  policyTypes:
+  - Egress
@@ -0,0 +1,11 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: allow-all-ingress
+spec:
+  podSelector: {}
+  ingress:
+  - {}
+  policyTypes:
+  - Ingress
@@ -0,0 +1,10 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: default-deny-all
+spec:
+  podSelector: {}
+  policyTypes:
+  - Ingress
+  - Egress
@@ -0,0 +1,9 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: default-deny-egress
+spec:
+  podSelector: {}
+  policyTypes:
+  - Egress
@@ -0,0 +1,9 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: default-deny-ingress
+spec:
+  podSelector: {}
+  policyTypes:
+  - Ingress
@@ -0,0 +1,13 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: access-nginx
+spec:
+  podSelector:
+    matchLabels:
+      app: nginx
+  ingress:
+  - from:
+    - podSelector:
+        matchLabels:
+          access: "true"