diff --git a/_data/samples.yml b/_data/samples.yml index 52ac8d572a..3a9f0bcf28 100644 --- a/_data/samples.yml +++ b/_data/samples.yml @@ -12,6 +12,8 @@ toc: path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/ - title: CephFS path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cephfs/ + - title: CockroachDB + path: https://github.com/kubernetes/kubernetes/tree/release-1.4/examples/cockroachdb/ - title: GlusterFS path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/glusterfs/ - title: Hazelcast diff --git a/_data/tasks.yml b/_data/tasks.yml index 90c1f3b8b2..38e1a89c68 100644 --- a/_data/tasks.yml +++ b/_data/tasks.yml @@ -8,6 +8,8 @@ toc: path: /docs/tasks/configure-pod-container/define-environment-variable-container/ - title: Defining a Command and Arguments for a Container path: /docs/tasks/configure-pod-container/define-command-argument-container/ + - title: Assigning CPU and RAM Resources to a Container + path: /docs/tasks/configure-pod-container/assign-cpu-ram-container/ - title: Accessing Applications in a Cluster section: - title: Using Port Forwarding to Access Applications in a Cluster diff --git a/_includes/partner-script.js b/_includes/partner-script.js index 00dc9f1ee1..e4a5362df0 100644 --- a/_includes/partner-script.js +++ b/_includes/partner-script.js @@ -188,6 +188,13 @@ logo: 'jetstack', link: 'https://www.jetstack.io/', blurb: 'Jetstack is an organisation focused entirely on Kubernetes. They will help you to get the most out of Kubernetes through expert professional services and open source tooling. Get in touch, and accelerate your project.' + }, + { + type: 1, + name: 'Tigera', + logo: 'tigera', + link: 'http://docs.projectcalico.org/v1.5/getting-started/kubernetes/', + blurb: 'Tigera builds high performance, policy driven, cloud native networking solutions for Kubernetes.' } ] diff --git a/_includes/v1.4/extensions-v1beta1-definitions.html b/_includes/v1.4/extensions-v1beta1-definitions.html index 59be34cd40..62b899b9fd 100755 --- a/_includes/v1.4/extensions-v1beta1-definitions.html +++ b/_includes/v1.4/extensions-v1beta1-definitions.html @@ -69,12 +69,6 @@
StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.
-StorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.
-| Name | -Description | -Required | -Schema | -Default | -
|---|---|---|---|---|
kind |
-Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds |
-false |
-string |
-- |
apiVersion |
-APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources |
-false |
-string |
-- |
metadata |
-Standard object’s metadata. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#metadata |
-false |
-- | - |
provisioner |
-Provisioner indicates the type of the provisioner. |
-true |
-string |
-- |
parameters |
-Parameters holds the parameters for the provisioner that should create volumes of this storage class. |
-false |
-object |
-- |
Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.
StorageClassList is a collection of storage classes.
-| Name | -Description | -Required | -Schema | -Default | -
|---|---|---|---|---|
kind |
-Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds |
-false |
-string |
-- |
apiVersion |
-APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources |
-false |
-string |
-- |
metadata |
-Standard list metadata More info: http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#metadata |
-false |
-- | - |
items |
-Items is the list of StorageClasses |
-true |
-v1beta1.StorageClass array |
-- |