diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json
index cf8bd2f4abe..dab28d951ef 100644
--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -4,6 +4,831 @@
"basePath": "https://10.10.10.10:6443",
"resourcePath": "/apis/extensions/v1beta1",
"apis": [
+ {
+ "path": "/apis/extensions/v1beta1/namespaces/{namespace}/daemonsets",
+ "description": "API at /apis/extensions/v1beta1",
+ "operations": [
+ {
+ "type": "v1beta1.DaemonSetList",
+ "method": "GET",
+ "summary": "list or watch objects of kind DaemonSet",
+ "nickname": "listNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "labelSelector",
+ "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "fieldSelector",
+ "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "watch",
+ "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "resourceVersion",
+ "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "integer",
+ "paramType": "query",
+ "name": "timeoutSeconds",
+ "description": "Timeout for the list/watch call.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "v1beta1.DaemonSetList"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ },
+ {
+ "type": "v1beta1.DaemonSet",
+ "method": "POST",
+ "summary": "create a DaemonSet",
+ "nickname": "createNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "v1beta1.DaemonSet",
+ "paramType": "body",
+ "name": "body",
+ "description": "",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "v1beta1.DaemonSet"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ },
+ {
+ "type": "unversioned.Status",
+ "method": "DELETE",
+ "summary": "delete collection of DaemonSet",
+ "nickname": "deletecollectionNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "labelSelector",
+ "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "fieldSelector",
+ "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "watch",
+ "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "resourceVersion",
+ "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "integer",
+ "paramType": "query",
+ "name": "timeoutSeconds",
+ "description": "Timeout for the list/watch call.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "unversioned.Status"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ }
+ ]
+ },
+ {
+ "path": "/apis/extensions/v1beta1/watch/namespaces/{namespace}/daemonsets",
+ "description": "API at /apis/extensions/v1beta1",
+ "operations": [
+ {
+ "type": "json.WatchEvent",
+ "method": "GET",
+ "summary": "watch individual changes to a list of DaemonSet",
+ "nickname": "watchNamespacedDaemonSetList",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "labelSelector",
+ "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "fieldSelector",
+ "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "watch",
+ "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "resourceVersion",
+ "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "integer",
+ "paramType": "query",
+ "name": "timeoutSeconds",
+ "description": "Timeout for the list/watch call.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "json.WatchEvent"
+ }
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ }
+ ]
+ },
+ {
+ "path": "/apis/extensions/v1beta1/namespaces/{namespace}/daemonsets/{name}",
+ "description": "API at /apis/extensions/v1beta1",
+ "operations": [
+ {
+ "type": "v1beta1.DaemonSet",
+ "method": "GET",
+ "summary": "read the specified DaemonSet",
+ "nickname": "readNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "export",
+ "description": "Should this value be exported. Export strips fields that a user can not specify.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "exact",
+ "description": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "name",
+ "description": "name of the DaemonSet",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "v1beta1.DaemonSet"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ },
+ {
+ "type": "v1beta1.DaemonSet",
+ "method": "PUT",
+ "summary": "replace the specified DaemonSet",
+ "nickname": "replaceNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "v1beta1.DaemonSet",
+ "paramType": "body",
+ "name": "body",
+ "description": "",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "name",
+ "description": "name of the DaemonSet",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "v1beta1.DaemonSet"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ },
+ {
+ "type": "v1beta1.DaemonSet",
+ "method": "PATCH",
+ "summary": "partially update the specified DaemonSet",
+ "nickname": "patchNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "unversioned.Patch",
+ "paramType": "body",
+ "name": "body",
+ "description": "",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "name",
+ "description": "name of the DaemonSet",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "v1beta1.DaemonSet"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "application/json-patch+json",
+ "application/merge-patch+json",
+ "application/strategic-merge-patch+json"
+ ]
+ },
+ {
+ "type": "unversioned.Status",
+ "method": "DELETE",
+ "summary": "delete a DaemonSet",
+ "nickname": "deleteNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "v1.DeleteOptions",
+ "paramType": "body",
+ "name": "body",
+ "description": "",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "name",
+ "description": "name of the DaemonSet",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "unversioned.Status"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ }
+ ]
+ },
+ {
+ "path": "/apis/extensions/v1beta1/watch/namespaces/{namespace}/daemonsets/{name}",
+ "description": "API at /apis/extensions/v1beta1",
+ "operations": [
+ {
+ "type": "json.WatchEvent",
+ "method": "GET",
+ "summary": "watch changes to an object of kind DaemonSet",
+ "nickname": "watchNamespacedDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "labelSelector",
+ "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "fieldSelector",
+ "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "watch",
+ "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "resourceVersion",
+ "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "integer",
+ "paramType": "query",
+ "name": "timeoutSeconds",
+ "description": "Timeout for the list/watch call.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "name",
+ "description": "name of the DaemonSet",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "json.WatchEvent"
+ }
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ }
+ ]
+ },
+ {
+ "path": "/apis/extensions/v1beta1/daemonsets",
+ "description": "API at /apis/extensions/v1beta1",
+ "operations": [
+ {
+ "type": "v1beta1.DaemonSetList",
+ "method": "GET",
+ "summary": "list or watch objects of kind DaemonSet",
+ "nickname": "listDaemonSet",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "labelSelector",
+ "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "fieldSelector",
+ "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "watch",
+ "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "resourceVersion",
+ "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "integer",
+ "paramType": "query",
+ "name": "timeoutSeconds",
+ "description": "Timeout for the list/watch call.",
+ "required": false,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "v1beta1.DaemonSetList"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ }
+ ]
+ },
+ {
+ "path": "/apis/extensions/v1beta1/watch/daemonsets",
+ "description": "API at /apis/extensions/v1beta1",
+ "operations": [
+ {
+ "type": "json.WatchEvent",
+ "method": "GET",
+ "summary": "watch individual changes to a list of DaemonSet",
+ "nickname": "watchDaemonSetList",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "labelSelector",
+ "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "fieldSelector",
+ "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "boolean",
+ "paramType": "query",
+ "name": "watch",
+ "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "resourceVersion",
+ "description": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "integer",
+ "paramType": "query",
+ "name": "timeoutSeconds",
+ "description": "Timeout for the list/watch call.",
+ "required": false,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "json.WatchEvent"
+ }
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ }
+ ]
+ },
+ {
+ "path": "/apis/extensions/v1beta1/namespaces/{namespace}/daemonsets/{name}/status",
+ "description": "API at /apis/extensions/v1beta1",
+ "operations": [
+ {
+ "type": "v1beta1.DaemonSet",
+ "method": "PUT",
+ "summary": "replace status of the specified DaemonSet",
+ "nickname": "replaceNamespacedDaemonSetStatus",
+ "parameters": [
+ {
+ "type": "string",
+ "paramType": "query",
+ "name": "pretty",
+ "description": "If 'true', then the output is pretty printed.",
+ "required": false,
+ "allowMultiple": false
+ },
+ {
+ "type": "v1beta1.DaemonSet",
+ "paramType": "body",
+ "name": "body",
+ "description": "",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "namespace",
+ "description": "object name and auth scope, such as for teams and projects",
+ "required": true,
+ "allowMultiple": false
+ },
+ {
+ "type": "string",
+ "paramType": "path",
+ "name": "name",
+ "description": "name of the DaemonSet",
+ "required": true,
+ "allowMultiple": false
+ }
+ ],
+ "responseMessages": [
+ {
+ "code": 200,
+ "message": "OK",
+ "responseModel": "v1beta1.DaemonSet"
+ }
+ ],
+ "produces": [
+ "application/json",
+ "application/yaml"
+ ],
+ "consumes": [
+ "*/*"
+ ]
+ }
+ ]
+ },
{
"path": "/apis/extensions/v1beta1/namespaces/{namespace}/deployments",
"description": "API at /apis/extensions/v1beta1",
@@ -4374,9 +5199,9 @@
}
],
"models": {
- "v1beta1.DeploymentList": {
- "id": "v1beta1.DeploymentList",
- "description": "DeploymentList is a list of Deployments.",
+ "v1beta1.DaemonSetList": {
+ "id": "v1beta1.DaemonSetList",
+ "description": "DaemonSetList is a collection of daemon sets.",
"required": [
"items"
],
@@ -4391,14 +5216,14 @@
},
"metadata": {
"$ref": "unversioned.ListMeta",
- "description": "Standard list metadata."
+ "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
},
"items": {
"type": "array",
"items": {
- "$ref": "v1beta1.Deployment"
+ "$ref": "v1beta1.DaemonSet"
},
- "description": "Items is the list of Deployments."
+ "description": "Items is a list of daemon sets."
}
}
},
@@ -4416,9 +5241,9 @@
}
}
},
- "v1beta1.Deployment": {
- "id": "v1beta1.Deployment",
- "description": "Deployment enables declarative updates for Pods and ReplicaSets.",
+ "v1beta1.DaemonSet": {
+ "id": "v1beta1.DaemonSet",
+ "description": "DaemonSet represents the configuration of a daemon set.",
"properties": {
"kind": {
"type": "string",
@@ -4430,15 +5255,15 @@
},
"metadata": {
"$ref": "v1.ObjectMeta",
- "description": "Standard object metadata."
+ "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
},
"spec": {
- "$ref": "v1beta1.DeploymentSpec",
- "description": "Specification of the desired behavior of the Deployment."
+ "$ref": "v1beta1.DaemonSetSpec",
+ "description": "Spec defines the desired behavior of this daemon set. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status"
},
"status": {
- "$ref": "v1beta1.DeploymentStatus",
- "description": "Most recently observed status of the Deployment."
+ "$ref": "v1beta1.DaemonSetStatus",
+ "description": "Status is the current status of this daemon set. This data may be out of date by some window of time. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status"
}
}
},
@@ -4498,47 +5323,20 @@
}
}
},
- "v1beta1.DeploymentSpec": {
- "id": "v1beta1.DeploymentSpec",
- "description": "DeploymentSpec is the specification of the desired behavior of the Deployment.",
+ "v1beta1.DaemonSetSpec": {
+ "id": "v1beta1.DaemonSetSpec",
+ "description": "DaemonSetSpec is the specification of a daemon set.",
"required": [
"template"
],
"properties": {
- "replicas": {
- "type": "integer",
- "format": "int32",
- "description": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1."
- },
"selector": {
"$ref": "v1beta1.LabelSelector",
- "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment."
+ "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
},
"template": {
"$ref": "v1.PodTemplateSpec",
- "description": "Template describes the pods that will be created."
- },
- "strategy": {
- "$ref": "v1beta1.DeploymentStrategy",
- "description": "The deployment strategy to use to replace existing pods with new ones."
- },
- "minReadySeconds": {
- "type": "integer",
- "format": "int32",
- "description": "Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)"
- },
- "revisionHistoryLimit": {
- "type": "integer",
- "format": "int32",
- "description": "The number of old ReplicaSets to retain to allow rollback. This is a pointer to distinguish between explicit zero and not specified."
- },
- "paused": {
- "type": "boolean",
- "description": "Indicates that the deployment is paused and will not be processed by the deployment controller."
- },
- "rollbackTo": {
- "$ref": "v1beta1.RollbackConfig",
- "description": "The config this deployment is rolling back to. Will be cleared after rollback is done."
+ "description": "Template is the object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template's node selector (or on every node if no node selector is specified). More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#pod-template"
}
}
},
@@ -5762,67 +6560,29 @@
"id": "integer",
"properties": {}
},
- "v1beta1.DeploymentStrategy": {
- "id": "v1beta1.DeploymentStrategy",
- "description": "DeploymentStrategy describes how to replace existing pods with new ones.",
+ "v1beta1.DaemonSetStatus": {
+ "id": "v1beta1.DaemonSetStatus",
+ "description": "DaemonSetStatus represents the current status of a daemon set.",
+ "required": [
+ "currentNumberScheduled",
+ "numberMisscheduled",
+ "desiredNumberScheduled"
+ ],
"properties": {
- "type": {
- "type": "string",
- "description": "Type of deployment. Can be \"Recreate\" or \"RollingUpdate\". Default is RollingUpdate."
- },
- "rollingUpdate": {
- "$ref": "v1beta1.RollingUpdateDeployment",
- "description": "Rolling update config params. Present only if DeploymentStrategyType = RollingUpdate."
- }
- }
- },
- "v1beta1.RollingUpdateDeployment": {
- "id": "v1beta1.RollingUpdateDeployment",
- "description": "Spec to control the desired behavior of rolling update.",
- "properties": {
- "maxUnavailable": {
- "type": "string",
- "description": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods."
- },
- "maxSurge": {
- "type": "string",
- "description": "The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). This can not be 0 if MaxUnavailable is 0. Absolute number is calculated from percentage by rounding up. By default, a value of 1 is used. Example: when this is set to 30%, the new RC can be scaled up immediately when the rolling update starts, such that the total number of old and new pods do not exceed 130% of desired pods. Once old pods have been killed, new RC can be scaled up further, ensuring that total number of pods running at any time during the update is atmost 130% of desired pods."
- }
- }
- },
- "v1beta1.RollbackConfig": {
- "id": "v1beta1.RollbackConfig",
- "properties": {
- "revision": {
- "type": "integer",
- "format": "int64",
- "description": "The revision to rollback to. If set to 0, rollbck to the last revision."
- }
- }
- },
- "v1beta1.DeploymentStatus": {
- "id": "v1beta1.DeploymentStatus",
- "description": "DeploymentStatus is the most recently observed status of the Deployment.",
- "properties": {
- "replicas": {
+ "currentNumberScheduled": {
"type": "integer",
"format": "int32",
- "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector)."
+ "description": "CurrentNumberScheduled is the number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md"
},
- "updatedReplicas": {
+ "numberMisscheduled": {
"type": "integer",
"format": "int32",
- "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec."
+ "description": "NumberMisscheduled is the number of nodes that are running the daemon pod, but are not supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md"
},
- "availableReplicas": {
+ "desiredNumberScheduled": {
"type": "integer",
"format": "int32",
- "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment."
- },
- "unavailableReplicas": {
- "type": "integer",
- "format": "int32",
- "description": "Total number of unavailable pods targeted by this deployment."
+ "description": "DesiredNumberScheduled is the total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md"
}
}
},
@@ -5953,6 +6713,168 @@
}
}
},
+ "v1beta1.DeploymentList": {
+ "id": "v1beta1.DeploymentList",
+ "description": "DeploymentList is a list of Deployments.",
+ "required": [
+ "items"
+ ],
+ "properties": {
+ "kind": {
+ "type": "string",
+ "description": "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/HEAD/docs/devel/api-conventions.md#types-kinds"
+ },
+ "apiVersion": {
+ "type": "string",
+ "description": "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/HEAD/docs/devel/api-conventions.md#resources"
+ },
+ "metadata": {
+ "$ref": "unversioned.ListMeta",
+ "description": "Standard list metadata."
+ },
+ "items": {
+ "type": "array",
+ "items": {
+ "$ref": "v1beta1.Deployment"
+ },
+ "description": "Items is the list of Deployments."
+ }
+ }
+ },
+ "v1beta1.Deployment": {
+ "id": "v1beta1.Deployment",
+ "description": "Deployment enables declarative updates for Pods and ReplicaSets.",
+ "properties": {
+ "kind": {
+ "type": "string",
+ "description": "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/HEAD/docs/devel/api-conventions.md#types-kinds"
+ },
+ "apiVersion": {
+ "type": "string",
+ "description": "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/HEAD/docs/devel/api-conventions.md#resources"
+ },
+ "metadata": {
+ "$ref": "v1.ObjectMeta",
+ "description": "Standard object metadata."
+ },
+ "spec": {
+ "$ref": "v1beta1.DeploymentSpec",
+ "description": "Specification of the desired behavior of the Deployment."
+ },
+ "status": {
+ "$ref": "v1beta1.DeploymentStatus",
+ "description": "Most recently observed status of the Deployment."
+ }
+ }
+ },
+ "v1beta1.DeploymentSpec": {
+ "id": "v1beta1.DeploymentSpec",
+ "description": "DeploymentSpec is the specification of the desired behavior of the Deployment.",
+ "required": [
+ "template"
+ ],
+ "properties": {
+ "replicas": {
+ "type": "integer",
+ "format": "int32",
+ "description": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1."
+ },
+ "selector": {
+ "$ref": "v1beta1.LabelSelector",
+ "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment."
+ },
+ "template": {
+ "$ref": "v1.PodTemplateSpec",
+ "description": "Template describes the pods that will be created."
+ },
+ "strategy": {
+ "$ref": "v1beta1.DeploymentStrategy",
+ "description": "The deployment strategy to use to replace existing pods with new ones."
+ },
+ "minReadySeconds": {
+ "type": "integer",
+ "format": "int32",
+ "description": "Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)"
+ },
+ "revisionHistoryLimit": {
+ "type": "integer",
+ "format": "int32",
+ "description": "The number of old ReplicaSets to retain to allow rollback. This is a pointer to distinguish between explicit zero and not specified."
+ },
+ "paused": {
+ "type": "boolean",
+ "description": "Indicates that the deployment is paused and will not be processed by the deployment controller."
+ },
+ "rollbackTo": {
+ "$ref": "v1beta1.RollbackConfig",
+ "description": "The config this deployment is rolling back to. Will be cleared after rollback is done."
+ }
+ }
+ },
+ "v1beta1.DeploymentStrategy": {
+ "id": "v1beta1.DeploymentStrategy",
+ "description": "DeploymentStrategy describes how to replace existing pods with new ones.",
+ "properties": {
+ "type": {
+ "type": "string",
+ "description": "Type of deployment. Can be \"Recreate\" or \"RollingUpdate\". Default is RollingUpdate."
+ },
+ "rollingUpdate": {
+ "$ref": "v1beta1.RollingUpdateDeployment",
+ "description": "Rolling update config params. Present only if DeploymentStrategyType = RollingUpdate."
+ }
+ }
+ },
+ "v1beta1.RollingUpdateDeployment": {
+ "id": "v1beta1.RollingUpdateDeployment",
+ "description": "Spec to control the desired behavior of rolling update.",
+ "properties": {
+ "maxUnavailable": {
+ "type": "string",
+ "description": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods."
+ },
+ "maxSurge": {
+ "type": "string",
+ "description": "The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). This can not be 0 if MaxUnavailable is 0. Absolute number is calculated from percentage by rounding up. By default, a value of 1 is used. Example: when this is set to 30%, the new RC can be scaled up immediately when the rolling update starts, such that the total number of old and new pods do not exceed 130% of desired pods. Once old pods have been killed, new RC can be scaled up further, ensuring that total number of pods running at any time during the update is atmost 130% of desired pods."
+ }
+ }
+ },
+ "v1beta1.RollbackConfig": {
+ "id": "v1beta1.RollbackConfig",
+ "properties": {
+ "revision": {
+ "type": "integer",
+ "format": "int64",
+ "description": "The revision to rollback to. If set to 0, rollbck to the last revision."
+ }
+ }
+ },
+ "v1beta1.DeploymentStatus": {
+ "id": "v1beta1.DeploymentStatus",
+ "description": "DeploymentStatus is the most recently observed status of the Deployment.",
+ "properties": {
+ "replicas": {
+ "type": "integer",
+ "format": "int32",
+ "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector)."
+ },
+ "updatedReplicas": {
+ "type": "integer",
+ "format": "int32",
+ "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec."
+ },
+ "availableReplicas": {
+ "type": "integer",
+ "format": "int32",
+ "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment."
+ },
+ "unavailableReplicas": {
+ "type": "integer",
+ "format": "int32",
+ "description": "Total number of unavailable pods targeted by this deployment."
+ }
+ }
+ },
"v1beta1.DeploymentRollback": {
"id": "v1beta1.DeploymentRollback",
"description": "DeploymentRollback stores the information required to rollback a deployment.",
diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh
index 3679b843345..d3c6f216332 100644
--- a/cluster/aws/config-default.sh
+++ b/cluster/aws/config-default.sh
@@ -86,10 +86,6 @@ MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}"
# Runtime config
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
-# Enable various v1beta1 features
-ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-}"
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-}"
-
# Optional: Cluster monitoring to setup as part of the cluster bring up:
# none - No cluster monitoring setup
# influxdb - Heapster, InfluxDB, and Grafana
diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh
index 770f777f278..050469ea9da 100755
--- a/cluster/aws/config-test.sh
+++ b/cluster/aws/config-test.sh
@@ -82,9 +82,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}"
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
-# Enable various v1beta1 features
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
-
# Optional: Cluster monitoring to setup as part of the cluster bring up:
# none - No cluster monitoring setup
# influxdb - Heapster, InfluxDB, and Grafana
diff --git a/cluster/common.sh b/cluster/common.sh
index 842ae363b53..6662a0f3f47 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -420,17 +420,11 @@ function yaml-quote {
echo "'$(echo "${@}" | sed -e "s/'/''/g")'"
}
-# Builds the RUNTIME_CONFIG var from other feature enable options
+# Builds the RUNTIME_CONFIG var from other feature enable options (such as
+# features in alpha)
function build-runtime-config() {
- if [[ "${ENABLE_DAEMONSETS}" == "true" ]]; then
- if [[ -z "${RUNTIME_CONFIG}" ]]; then
- RUNTIME_CONFIG="extensions/v1beta1/daemonsets=true"
- else
- if echo "${RUNTIME_CONFIG}" | grep -q -v "extensions/v1beta1/daemonsets=true"; then
- RUNTIME_CONFIG="${RUNTIME_CONFIG},extensions/v1beta1/daemonsets=true"
- fi
- fi
- fi
+ # There is nothing to do here for now. Just using this function as a placeholder.
+ :
}
function write-master-env {
diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index db7440fe0b6..ab6b82dc35a 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -80,10 +80,6 @@ fi
# Optional: customize runtime config
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
-# Optional: enable v1beta1 related features
-ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-}"
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-}"
-
# Optional: Install cluster DNS.
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
DNS_SERVER_IP="10.0.0.10"
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index c85d949db4b..76358f17e20 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -50,10 +50,6 @@ NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}"
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
-# Optional: enable v1beta1 related features
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
-ENABLE_REPLICASETS="${KUBE_ENABLE_REPLICASETS:-true}"
-
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
POLL_SLEEP_INTERVAL=3
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
diff --git a/cluster/kubemark/config-default.sh b/cluster/kubemark/config-default.sh
index 43fe1637580..d0a4b391246 100644
--- a/cluster/kubemark/config-default.sh
+++ b/cluster/kubemark/config-default.sh
@@ -41,9 +41,6 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}"
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
-# Optional: enable v1beta1 related features
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
-
TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=2}"
TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=12h}"
diff --git a/docs/admin/daemons.md b/docs/admin/daemons.md
index 4caf4632b72..709277191c3 100644
--- a/docs/admin/daemons.md
+++ b/docs/admin/daemons.md
@@ -52,7 +52,6 @@ Documentation for other releases can be found at
- [Bare Pods](#bare-pods)
- [Static Pods](#static-pods)
- [Replication Controller](#replication-controller)
- - [Caveats](#caveats)
@@ -208,18 +207,6 @@ number of replicas and rolling out updates are more important than controlling e
the pod runs on. Use a Daemon Controller when it is important that a copy of a pod always run on
all or certain hosts, and when it needs to start before other pods.
-## Caveats
-
-DaemonSet objects are in the [`extensions` API Group](../api.md#api-groups).
-DaemonSet is not enabled by default. Enable it by setting
-`--runtime-config=extensions/v1beta1/daemonsets=true` on the api server. This can be
-achieved by exporting KUBE_ENABLE_DAEMONSETS=true before running kube-up.sh script
-on GCE.
-
-DaemonSet objects effectively have [API version `v1alpha1`](../api.md#api-versioning).
- Alpha objects may change or even be discontinued in future software releases.
-However, due to to a known issue, they will appear as API version `v1beta1` if enabled.
-
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html
index cb378740600..9e38c08ea9f 100755
--- a/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/docs/api-reference/extensions/v1beta1/definitions.html
@@ -394,6 +394,12 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
v1beta1.Scale
+v1beta1.DaemonSet
+
+
+v1beta1.DaemonSetList
+
+
v1beta1.Ingress
@@ -466,6 +472,54 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
+
+
+
v1beta1.DaemonSetStatus
+
+
DaemonSetStatus represents the current status of a daemon set.
+
+
+
+
+
+
+
+
+
+
+
+| Name |
+Description |
+Required |
+Schema |
+Default |
+
+
+
+
+currentNumberScheduled |
+CurrentNumberScheduled is the number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md |
+true |
+integer (int32) |
+ |
+
+
+numberMisscheduled |
+NumberMisscheduled is the number of nodes that are running the daemon pod, but are not supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md |
+true |
+integer (int32) |
+ |
+
+
+desiredNumberScheduled |
+DesiredNumberScheduled is the total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md |
+true |
+integer (int32) |
+ |
+
+
+
+
v1beta1.Job
@@ -2630,6 +2684,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
+
+
+
v1beta1.DaemonSetSpec
+
+
DaemonSetSpec is the specification of a daemon set.
+
+
+
v1beta1.LabelSelector
@@ -2922,6 +3017,68 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
+
+
+
v1beta1.DaemonSet
+
+
DaemonSet represents the configuration of a daemon set.
+
+
+
v1beta1.IngressList
@@ -4014,6 +4171,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
+
+
+
v1beta1.DaemonSetList
+
+
DaemonSetList is a collection of daemon sets.
+
+
+
v1.Volume
@@ -5365,7 +5577,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/extensions/v1beta1/operations.html b/docs/api-reference/extensions/v1beta1/operations.html
index f73899fc6e9..e927da10181 100755
--- a/docs/api-reference/extensions/v1beta1/operations.html
+++ b/docs/api-reference/extensions/v1beta1/operations.html
@@ -437,10 +437,10 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }