Merge remote-tracking branch 'upstream/master' into merged-master-dev-1.16

content/en/blog/_posts/2018-05-29-announcing-kustomize.md

@@ -11,7 +11,7 @@ date: 2018-05-29
 [kustomization]: https://github.com/kubernetes-sigs/kustomize/blob/master/docs/glossary.md#kustomization
 [mailing list]: https://groups.google.com/forum/#!forum/kustomize
 [open an issue]: https://github.com/kubernetes-sigs/kustomize/issues/new
-[subproject]: https://github.com/kubernetes/community/blob/master/keps/sig-cli/0008-kustomize.md
+[subproject]: https://github.com/kubernetes/enhancements/blob/master/keps/sig-cli/0008-kustomize.md
 [SIG-CLI]: https://github.com/kubernetes/community/tree/master/sig-cli
 [workflow]: https://github.com/kubernetes-sigs/kustomize/blob/master/docs/workflows.md
 

content/en/blog/_posts/2018-10-10-runtimeclass.md

@@ -42,6 +42,6 @@ RuntimeClass will be under active development at least through 2019, and we’re
 ## Learn More
 
 - Take it for a spin! As an alpha feature, there are some additional setup steps to use RuntimeClass. Refer to the [RuntimeClass documentation](/docs/concepts/containers/runtime-class/#runtime-class) for how to get it running.
-- Check out the [RuntimeClass Kubernetes Enhancement Proposal](https://github.com/kubernetes/community/blob/master/keps/sig-node/0014-runtime-class.md) for more nitty-gritty design details.
+- Check out the [RuntimeClass Kubernetes Enhancement Proposal](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/0014-runtime-class.md) for more nitty-gritty design details.
 - The [Sandbox Isolation Level Decision](https://docs.google.com/document/d/1fe7lQUjYKR0cijRmSbH_y0_l3CYPkwtQa5ViywuNo8Q/preview) documents the thought process that initially went into making RuntimeClass a pod-level choice.
 - Join the discussions and help shape the future of RuntimeClass with the [SIG-Node community](https://github.com/kubernetes/community/tree/master/sig-node)

content/en/blog/_posts/2019-06-20-Future-of-CRDs-Structural-Schemas.md

@@ -68,6 +68,8 @@ properties:
     properties
       command:
         type: string
+      shell:
+        type: string
       machines:
         type: array
         items:
@@ -92,14 +94,14 @@ properties:
       shell:
         type: string
         minLength: 1                          # value validation
-      oneOf:                                  # value validation
-      - required: [“command”]                 # value validation
-      - required: [“shell”]                   # value validation
       machines:
         type: array
         items:
           type: string
           pattern: “^[a-z0-9]+(-[a-z0-9]+)*$” # value validation
+    oneOf:                                    # value validation
+    - required: [“command”]                   # value validation
+    - required: [“shell”]                     # value validation
 required: [“spec”]                            # value validation
 ```
 
@@ -130,16 +132,20 @@ properties:
       shell:
         type: string
         minLength: 1
-      oneOf:
-      - type: string
-        required: [“command”]
-      - type: string
-        required: [“shell”]
       machines:
         type: array
         items:
           type: string
           pattern: “^[a-z0-9]+(-[a-z0-9]+)*$”
+    oneOf:
+    - properties:
+        command:
+          type: string
+      required: [“command”]
+    - properties:
+        shell:
+          type: string
+      required: [“shell”]
     not:
       properties:
         privileged: {}

content/en/blog/_posts/2019-07-18-some-apis-are-being-deprecated.md

@@ -34,8 +34,8 @@ from **extensions/v1beta1**, **apps/v1beta1**, or **apps/v1beta2** in **v1.16**.
   * Migrate to the apps/v1 API, available since v1.9. Existing persisted data
     can be retrieved/updated via the apps/v1 API.
 * Ingress: will no longer be served from **extensions/v1beta1** in **v1.18**.
-  * Migrate to the networking.k8s.io/v1beta1 API. Existing persisted data can be
-    retrieved/updated via the networking.k8s.io/v1beta1 API.
+  * Migrate to the networking.k8s.io/v1beta1 API, serving Ingress since v1.14.
+    Existing persisted data can be retrieved/updated via the networking.k8s.io/v1beta1 API.
 
 # What To Do