Skip to content

K
k3s
Commit b0c086ee authored by Janet Kuo's avatar Janet Kuo
Browse files
Options

Autogen

parent dc0167bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 822 additions and 59 deletions
api/openapi-spec/swagger.json
View file @ b0c086ee
...@@ -66904,6 +66904,35 @@ ...@@ -66904,6 +66904,35 @@
} }
] ]
}, },
"io.k8s.api.apps.v1.DaemonSetCondition": {
"description": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"required": [
"type",
"status"
],
"properties": {
"lastTransitionTime": {
"description": "Last time the condition transitioned from one status to another.",
"$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time"
},
"message": {
"description": "A human readable message indicating details about the transition.",
"type": "string"
},
"reason": {
"description": "The reason for the condition's last transition.",
"type": "string"
},
"status": {
"description": "Status of the condition, one of True, False, Unknown.",
"type": "string"
},
"type": {
"description": "Type of DaemonSet condition.",
"type": "string"
}
}
},
"io.k8s.api.apps.v1.DaemonSetList": { "io.k8s.api.apps.v1.DaemonSetList": {
"description": "DaemonSetList is a collection of daemon sets.", "description": "DaemonSetList is a collection of daemon sets.",
"required": [ "required": [
...@@ -66982,6 +67011,15 @@ ...@@ -66982,6 +67011,15 @@
"type": "integer", "type": "integer",
"format": "int32" "format": "int32"
}, },
"conditions": {
"description": "Represents the latest available observations of a DaemonSet's current state.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.apps.v1.DaemonSetCondition"
},
"x-kubernetes-patch-merge-key": "type",
"x-kubernetes-patch-strategy": "merge"
},
"currentNumberScheduled": { "currentNumberScheduled": {
"description": "The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/", "description": "The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/",
"type": "integer", "type": "integer",
...@@ -68289,6 +68327,35 @@ ...@@ -68289,6 +68327,35 @@
} }
] ]
}, },
"io.k8s.api.apps.v1beta2.DaemonSetCondition": {
"description": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"required": [
"type",
"status"
],
"properties": {
"lastTransitionTime": {
"description": "Last time the condition transitioned from one status to another.",
"$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time"
},
"message": {
"description": "A human readable message indicating details about the transition.",
"type": "string"
},
"reason": {
"description": "The reason for the condition's last transition.",
"type": "string"
},
"status": {
"description": "Status of the condition, one of True, False, Unknown.",
"type": "string"
},
"type": {
"description": "Type of DaemonSet condition.",
"type": "string"
}
}
},
"io.k8s.api.apps.v1beta2.DaemonSetList": { "io.k8s.api.apps.v1beta2.DaemonSetList": {
"description": "DaemonSetList is a collection of daemon sets.", "description": "DaemonSetList is a collection of daemon sets.",
"required": [ "required": [
...@@ -68367,6 +68434,15 @@ ...@@ -68367,6 +68434,15 @@
"type": "integer", "type": "integer",
"format": "int32" "format": "int32"
}, },
"conditions": {
"description": "Represents the latest available observations of a DaemonSet's current state.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.apps.v1beta2.DaemonSetCondition"
},
"x-kubernetes-patch-merge-key": "type",
"x-kubernetes-patch-strategy": "merge"
},
"currentNumberScheduled": { "currentNumberScheduled": {
"description": "The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/", "description": "The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/",
"type": "integer", "type": "integer",
...@@ -75661,6 +75737,35 @@ ...@@ -75661,6 +75737,35 @@
} }
] ]
}, },
"io.k8s.api.extensions.v1beta1.DaemonSetCondition": {
"description": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"required": [
"type",
"status"
],
"properties": {
"lastTransitionTime": {
"description": "Last time the condition transitioned from one status to another.",
"$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time"
},
"message": {
"description": "A human readable message indicating details about the transition.",
"type": "string"
},
"reason": {
"description": "The reason for the condition's last transition.",
"type": "string"
},
"status": {
"description": "Status of the condition, one of True, False, Unknown.",
"type": "string"
},
"type": {
"description": "Type of DaemonSet condition.",
"type": "string"
}
}
},
"io.k8s.api.extensions.v1beta1.DaemonSetList": { "io.k8s.api.extensions.v1beta1.DaemonSetList": {
"description": "DaemonSetList is a collection of daemon sets.", "description": "DaemonSetList is a collection of daemon sets.",
"required": [ "required": [
...@@ -75744,6 +75849,15 @@ ...@@ -75744,6 +75849,15 @@
"type": "integer", "type": "integer",
"format": "int32" "format": "int32"
}, },
"conditions": {
"description": "Represents the latest available observations of a DaemonSet's current state.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DaemonSetCondition"
},
"x-kubernetes-patch-merge-key": "type",
"x-kubernetes-patch-strategy": "merge"
},
"currentNumberScheduled": { "currentNumberScheduled": {
"description": "The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/", "description": "The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/",
"type": "integer", "type": "integer",
api/swagger-spec/apps_v1.json
View file @ b0c086ee
...@@ -8146,6 +8146,43 @@ ...@@ -8146,6 +8146,43 @@
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"description": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision." "description": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision."
},
"conditions": {
"type": "array",
"items": {
"$ref": "v1.DaemonSetCondition"
},
"description": "Represents the latest available observations of a DaemonSet's current state."
}
}
},
"v1.DaemonSetCondition": {
"id": "v1.DaemonSetCondition",
"description": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"required": [
"type",
"status"
],
"properties": {
"type": {
"type": "string",
"description": "Type of DaemonSet condition."
},
"status": {
"type": "string",
"description": "Status of the condition, one of True, False, Unknown."
},
"lastTransitionTime": {
"type": "string",
"description": "Last time the condition transitioned from one status to another."
},
"reason": {
"type": "string",
"description": "The reason for the condition's last transition."
},
"message": {
"type": "string",
"description": "A human readable message indicating details about the transition."
} }
} }
}, },
......
api/swagger-spec/apps_v1beta2.json
View file @ b0c086ee
...@@ -8656,6 +8656,43 @@ ...@@ -8656,6 +8656,43 @@
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"description": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision." "description": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision."
},
"conditions": {
"type": "array",
"items": {
"$ref": "v1beta2.DaemonSetCondition"
},
"description": "Represents the latest available observations of a DaemonSet's current state."
}
}
},
"v1beta2.DaemonSetCondition": {
"id": "v1beta2.DaemonSetCondition",
"description": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"required": [
"type",
"status"
],
"properties": {
"type": {
"type": "string",
"description": "Type of DaemonSet condition."
},
"status": {
"type": "string",
"description": "Status of the condition, one of True, False, Unknown."
},
"lastTransitionTime": {
"type": "string",
"description": "Last time the condition transitioned from one status to another."
},
"reason": {
"type": "string",
"description": "The reason for the condition's last transition."
},
"message": {
"type": "string",
"description": "A human readable message indicating details about the transition."
} }
} }
}, },
......
api/swagger-spec/extensions_v1beta1.json
View file @ b0c086ee
...@@ -9298,6 +9298,43 @@ ...@@ -9298,6 +9298,43 @@
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"description": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision." "description": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision."
},
"conditions": {
"type": "array",
"items": {
"$ref": "v1beta1.DaemonSetCondition"
},
"description": "Represents the latest available observations of a DaemonSet's current state."
}
}
},
"v1beta1.DaemonSetCondition": {
"id": "v1beta1.DaemonSetCondition",
"description": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"required": [
"type",
"status"
],
"properties": {
"type": {
"type": "string",
"description": "Type of DaemonSet condition."
},
"status": {
"type": "string",
"description": "Status of the condition, one of True, False, Unknown."
},
"lastTransitionTime": {
"type": "string",
"description": "Last time the condition transitioned from one status to another."
},
"reason": {
"type": "string",
"description": "The reason for the condition's last transition."
},
"message": {
"type": "string",
"description": "A human readable message indicating details about the transition."
} }
} }
}, },
......
docs/api-reference/apps/v1/definitions.html
View file @ b0c086ee
...@@ -6820,6 +6820,68 @@ The StatefulSet guarantees that a given network identity will always map to the ...@@ -6820,6 +6820,68 @@ The StatefulSet guarantees that a given network identity will always map to the
</div> </div>
<div class="sect2"> <div class="sect2">
<h3 id="_v1_daemonsetcondition">v1.DaemonSetCondition</h3>
<div class="paragraph">
<p>DaemonSetCondition describes the state of a DaemonSet at a certain point.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
</colgroup>
<thead>
<tr>
<th class="tableblock halign-left valign-top">Name</th>
<th class="tableblock halign-left valign-top">Description</th>
<th class="tableblock halign-left valign-top">Required</th>
<th class="tableblock halign-left valign-top">Schema</th>
<th class="tableblock halign-left valign-top">Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">type</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Type of DaemonSet condition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">status</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Status of the condition, one of True, False, Unknown.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">lastTransitionTime</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Last time the condition transitioned from one status to another.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">reason</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The reason for the condition&#8217;s last transition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">message</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">A human readable message indicating details about the transition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
</div>
<div class="sect2">
<h3 id="_v1_hostalias">v1.HostAlias</h3> <h3 id="_v1_hostalias">v1.HostAlias</h3>
<div class="paragraph"> <div class="paragraph">
<p>HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the pod&#8217;s hosts file.</p> <p>HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the pod&#8217;s hosts file.</p>
...@@ -7216,6 +7278,13 @@ The StatefulSet guarantees that a given network identity will always map to the ...@@ -7216,6 +7278,13 @@ The StatefulSet guarantees that a given network identity will always map to the
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
</tr> </tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">conditions</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Represents the latest available observations of a DaemonSet&#8217;s current state.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_daemonsetcondition">v1.DaemonSetCondition</a> array</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody> </tbody>
</table> </table>
......
docs/api-reference/apps/v1beta2/definitions.html
View file @ b0c086ee
...@@ -2431,6 +2431,13 @@ When an object is created, the system will populate this list with the current s ...@@ -2431,6 +2431,13 @@ When an object is created, the system will populate this list with the current s
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
</tr> </tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">conditions</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Represents the latest available observations of a DaemonSet&#8217;s current state.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1beta2_daemonsetcondition">v1beta2.DaemonSetCondition</a> array</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody> </tbody>
</table> </table>
...@@ -3041,6 +3048,68 @@ When an object is created, the system will populate this list with the current s ...@@ -3041,6 +3048,68 @@ When an object is created, the system will populate this list with the current s
</div> </div>
<div class="sect2"> <div class="sect2">
<h3 id="_v1beta2_daemonsetcondition">v1beta2.DaemonSetCondition</h3>
<div class="paragraph">
<p>DaemonSetCondition describes the state of a DaemonSet at a certain point.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
</colgroup>
<thead>
<tr>
<th class="tableblock halign-left valign-top">Name</th>
<th class="tableblock halign-left valign-top">Description</th>
<th class="tableblock halign-left valign-top">Required</th>
<th class="tableblock halign-left valign-top">Schema</th>
<th class="tableblock halign-left valign-top">Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">type</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Type of DaemonSet condition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">status</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Status of the condition, one of True, False, Unknown.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">lastTransitionTime</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Last time the condition transitioned from one status to another.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">reason</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The reason for the condition&#8217;s last transition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">message</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">A human readable message indicating details about the transition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
</div>
<div class="sect2">
<h3 id="_v1beta2_daemonset">v1beta2.DaemonSet</h3> <h3 id="_v1beta2_daemonset">v1beta2.DaemonSet</h3>
<div class="paragraph"> <div class="paragraph">
<p>DaemonSet represents the configuration of a daemon set.</p> <p>DaemonSet represents the configuration of a daemon set.</p>
......
docs/api-reference/extensions/v1beta1/definitions.html
View file @ b0c086ee
...@@ -726,6 +726,13 @@ Examples: <code>/foo</code> would allow <code>/foo</code>, <code>/foo/</code> an ...@@ -726,6 +726,13 @@ Examples: <code>/foo</code> would allow <code>/foo</code>, <code>/foo/</code> an
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
</tr> </tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">conditions</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Represents the latest available observations of a DaemonSet&#8217;s current state.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1beta1_daemonsetcondition">v1beta1.DaemonSetCondition</a> array</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody> </tbody>
</table> </table>
...@@ -8176,6 +8183,68 @@ Both these may change in the future. Incoming requests are matched against the h ...@@ -8176,6 +8183,68 @@ Both these may change in the future. Incoming requests are matched against the h
</div> </div>
<div class="sect2"> <div class="sect2">
<h3 id="_v1beta1_daemonsetcondition">v1beta1.DaemonSetCondition</h3>
<div class="paragraph">
<p>DaemonSetCondition describes the state of a DaemonSet at a certain point.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
</colgroup>
<thead>
<tr>
<th class="tableblock halign-left valign-top">Name</th>
<th class="tableblock halign-left valign-top">Description</th>
<th class="tableblock halign-left valign-top">Required</th>
<th class="tableblock halign-left valign-top">Schema</th>
<th class="tableblock halign-left valign-top">Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">type</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Type of DaemonSet condition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">status</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Status of the condition, one of True, False, Unknown.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">lastTransitionTime</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Last time the condition transitioned from one status to another.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">reason</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The reason for the condition&#8217;s last transition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">message</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">A human readable message indicating details about the transition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
</div>
<div class="sect2">
<h3 id="_v1beta1_httpingresspath">v1beta1.HTTPIngressPath</h3> <h3 id="_v1beta1_httpingresspath">v1beta1.HTTPIngressPath</h3>
<div class="paragraph"> <div class="paragraph">
<p>HTTPIngressPath associates a path regex with a backend. Incoming urls matching the path are forwarded to the backend.</p> <p>HTTPIngressPath associates a path regex with a backend. Incoming urls matching the path are forwarded to the backend.</p>
......
pkg/apis/apps/v1/zz_generated.conversion.go
View file @ b0c086ee
...@@ -47,6 +47,8 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -47,6 +47,8 @@ func RegisterConversions(scheme *runtime.Scheme) error {
Convert_apps_ControllerRevisionList_To_v1_ControllerRevisionList, Convert_apps_ControllerRevisionList_To_v1_ControllerRevisionList,
Convert_v1_DaemonSet_To_extensions_DaemonSet, Convert_v1_DaemonSet_To_extensions_DaemonSet,
Convert_extensions_DaemonSet_To_v1_DaemonSet, Convert_extensions_DaemonSet_To_v1_DaemonSet,
Convert_v1_DaemonSetCondition_To_extensions_DaemonSetCondition,
Convert_extensions_DaemonSetCondition_To_v1_DaemonSetCondition,
Convert_v1_DaemonSetList_To_extensions_DaemonSetList, Convert_v1_DaemonSetList_To_extensions_DaemonSetList,
Convert_extensions_DaemonSetList_To_v1_DaemonSetList, Convert_extensions_DaemonSetList_To_v1_DaemonSetList,
Convert_v1_DaemonSetSpec_To_extensions_DaemonSetSpec, Convert_v1_DaemonSetSpec_To_extensions_DaemonSetSpec,
...@@ -188,6 +190,34 @@ func autoConvert_extensions_DaemonSet_To_v1_DaemonSet(in *extensions.DaemonSet, ...@@ -188,6 +190,34 @@ func autoConvert_extensions_DaemonSet_To_v1_DaemonSet(in *extensions.DaemonSet,
return nil return nil
} }
func autoConvert_v1_DaemonSetCondition_To_extensions_DaemonSetCondition(in *v1.DaemonSetCondition, out *extensions.DaemonSetCondition, s conversion.Scope) error {
out.Type = extensions.DaemonSetConditionType(in.Type)
out.Status = api.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason
out.Message = in.Message
return nil
}
// Convert_v1_DaemonSetCondition_To_extensions_DaemonSetCondition is an autogenerated conversion function.
func Convert_v1_DaemonSetCondition_To_extensions_DaemonSetCondition(in *v1.DaemonSetCondition, out *extensions.DaemonSetCondition, s conversion.Scope) error {
return autoConvert_v1_DaemonSetCondition_To_extensions_DaemonSetCondition(in, out, s)
}
func autoConvert_extensions_DaemonSetCondition_To_v1_DaemonSetCondition(in *extensions.DaemonSetCondition, out *v1.DaemonSetCondition, s conversion.Scope) error {
out.Type = v1.DaemonSetConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason
out.Message = in.Message
return nil
}
// Convert_extensions_DaemonSetCondition_To_v1_DaemonSetCondition is an autogenerated conversion function.
func Convert_extensions_DaemonSetCondition_To_v1_DaemonSetCondition(in *extensions.DaemonSetCondition, out *v1.DaemonSetCondition, s conversion.Scope) error {
return autoConvert_extensions_DaemonSetCondition_To_v1_DaemonSetCondition(in, out, s)
}
func autoConvert_v1_DaemonSetList_To_extensions_DaemonSetList(in *v1.DaemonSetList, out *extensions.DaemonSetList, s conversion.Scope) error { func autoConvert_v1_DaemonSetList_To_extensions_DaemonSetList(in *v1.DaemonSetList, out *extensions.DaemonSetList, s conversion.Scope) error {
out.ListMeta = in.ListMeta out.ListMeta = in.ListMeta
if in.Items != nil { if in.Items != nil {
...@@ -267,6 +297,7 @@ func autoConvert_v1_DaemonSetStatus_To_extensions_DaemonSetStatus(in *v1.DaemonS ...@@ -267,6 +297,7 @@ func autoConvert_v1_DaemonSetStatus_To_extensions_DaemonSetStatus(in *v1.DaemonS
out.NumberAvailable = in.NumberAvailable out.NumberAvailable = in.NumberAvailable
out.NumberUnavailable = in.NumberUnavailable out.NumberUnavailable = in.NumberUnavailable
out.CollisionCount = (*int32)(unsafe.Pointer(in.CollisionCount)) out.CollisionCount = (*int32)(unsafe.Pointer(in.CollisionCount))
out.Conditions = *(*[]extensions.DaemonSetCondition)(unsafe.Pointer(&in.Conditions))
return nil return nil
} }
...@@ -285,6 +316,7 @@ func autoConvert_extensions_DaemonSetStatus_To_v1_DaemonSetStatus(in *extensions ...@@ -285,6 +316,7 @@ func autoConvert_extensions_DaemonSetStatus_To_v1_DaemonSetStatus(in *extensions
out.NumberAvailable = in.NumberAvailable out.NumberAvailable = in.NumberAvailable
out.NumberUnavailable = in.NumberUnavailable out.NumberUnavailable = in.NumberUnavailable
out.CollisionCount = (*int32)(unsafe.Pointer(in.CollisionCount)) out.CollisionCount = (*int32)(unsafe.Pointer(in.CollisionCount))
out.Conditions = *(*[]v1.DaemonSetCondition)(unsafe.Pointer(&in.Conditions))
return nil return nil
} }
......
pkg/apis/extensions/zz_generated.deepcopy.go
View file @ b0c086ee
...@@ -63,6 +63,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { ...@@ -63,6 +63,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
return nil return nil
}, InType: reflect.TypeOf(&DaemonSet{})}, }, InType: reflect.TypeOf(&DaemonSet{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetCondition).DeepCopyInto(out.(*DaemonSetCondition))
return nil
}, InType: reflect.TypeOf(&DaemonSetCondition{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList)) in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList))
return nil return nil
}, InType: reflect.TypeOf(&DaemonSetList{})}, }, InType: reflect.TypeOf(&DaemonSetList{})},
...@@ -363,6 +367,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object { ...@@ -363,6 +367,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object {
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetCondition) DeepCopyInto(out *DaemonSetCondition) {
*out = *in
in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DaemonSetCondition.
func (in *DaemonSetCondition) DeepCopy() *DaemonSetCondition {
if in == nil {
return nil
}
out := new(DaemonSetCondition)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) { func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
...@@ -444,6 +465,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) { ...@@ -444,6 +465,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) {
**out = **in **out = **in
} }
} }
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
*out = make([]DaemonSetCondition, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return return
} }
......
staging/src/k8s.io/api/apps/v1/generated.proto
View file @ b0c086ee
...@@ -84,6 +84,27 @@ message DaemonSet { ...@@ -84,6 +84,27 @@ message DaemonSet {
optional DaemonSetStatus status = 3; optional DaemonSetStatus status = 3;
} }
// DaemonSetCondition describes the state of a DaemonSet at a certain point.
message DaemonSetCondition {
// Type of DaemonSet condition.
optional string type = 1;
// Status of the condition, one of True, False, Unknown.
optional string status = 2;
// Last time the condition transitioned from one status to another.
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 3;
// The reason for the condition's last transition.
// +optional
optional string reason = 4;
// A human readable message indicating details about the transition.
// +optional
optional string message = 5;
}
// DaemonSetList is a collection of daemon sets. // DaemonSetList is a collection of daemon sets.
message DaemonSetList { message DaemonSetList {
// Standard list metadata. // Standard list metadata.
...@@ -175,6 +196,12 @@ message DaemonSetStatus { ...@@ -175,6 +196,12 @@ message DaemonSetStatus {
// create the name for the newest ControllerRevision. // create the name for the newest ControllerRevision.
// +optional // +optional
optional int32 collisionCount = 9; optional int32 collisionCount = 9;
// Represents the latest available observations of a DaemonSet's current state.
// +optional
// +patchMergeKey=type
// +patchStrategy=merge
repeated DaemonSetCondition conditions = 10;
} }
// DaemonSetUpdateStrategy is a struct used to control the update strategy for a DaemonSet. // DaemonSetUpdateStrategy is a struct used to control the update strategy for a DaemonSet.
......
staging/src/k8s.io/api/apps/v1/types.go
View file @ b0c086ee
...@@ -558,7 +558,7 @@ type DaemonSetStatus struct { ...@@ -558,7 +558,7 @@ type DaemonSetStatus struct {
// +optional // +optional
// +patchMergeKey=type // +patchMergeKey=type
// +patchStrategy=merge // +patchStrategy=merge
Conditions []DaemonSetCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` Conditions []DaemonSetCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,10,rep,name=conditions"`
} }
type DaemonSetConditionType string type DaemonSetConditionType string
...@@ -568,18 +568,18 @@ type DaemonSetConditionType string ...@@ -568,18 +568,18 @@ type DaemonSetConditionType string
// DaemonSetCondition describes the state of a DaemonSet at a certain point. // DaemonSetCondition describes the state of a DaemonSet at a certain point.
type DaemonSetCondition struct { type DaemonSetCondition struct {
// Type of DaemonSet condition. // Type of DaemonSet condition.
Type DaemonSetConditionType `json:"type"` Type DaemonSetConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=DaemonSetConditionType"`
// Status of the condition, one of True, False, Unknown. // Status of the condition, one of True, False, Unknown.
Status v1.ConditionStatus `json:"status"` Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"`
// Last time the condition transitioned from one status to another. // Last time the condition transitioned from one status to another.
// +optional // +optional
LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"`
// The reason for the condition's last transition. // The reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"`
// A human readable message indicating details about the transition. // A human readable message indicating details about the transition.
// +optional // +optional
Message string `json:"message,omitempty"` Message string `json:"message,omitempty" protobuf:"bytes,5,opt,name=message"`
} }
// +genclient // +genclient
......
staging/src/k8s.io/api/apps/v1/types_swagger_doc_generated.go
View file @ b0c086ee
...@@ -59,6 +59,19 @@ func (DaemonSet) SwaggerDoc() map[string]string { ...@@ -59,6 +59,19 @@ func (DaemonSet) SwaggerDoc() map[string]string {
return map_DaemonSet return map_DaemonSet
} }
var map_DaemonSetCondition = map[string]string{
"": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"type": "Type of DaemonSet condition.",
"status": "Status of the condition, one of True, False, Unknown.",
"lastTransitionTime": "Last time the condition transitioned from one status to another.",
"reason": "The reason for the condition's last transition.",
"message": "A human readable message indicating details about the transition.",
}
func (DaemonSetCondition) SwaggerDoc() map[string]string {
return map_DaemonSetCondition
}
var map_DaemonSetList = map[string]string{ var map_DaemonSetList = map[string]string{
"": "DaemonSetList is a collection of daemon sets.", "": "DaemonSetList is a collection of daemon sets.",
"metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata", "metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
...@@ -93,6 +106,7 @@ var map_DaemonSetStatus = map[string]string{ ...@@ -93,6 +106,7 @@ var map_DaemonSetStatus = map[string]string{
"numberAvailable": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)", "numberAvailable": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)",
"numberUnavailable": "The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)", "numberUnavailable": "The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)",
"collisionCount": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision.", "collisionCount": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision.",
"conditions": "Represents the latest available observations of a DaemonSet's current state.",
} }
func (DaemonSetStatus) SwaggerDoc() map[string]string { func (DaemonSetStatus) SwaggerDoc() map[string]string {
......
staging/src/k8s.io/api/apps/v1/zz_generated.deepcopy.go
View file @ b0c086ee
...@@ -52,6 +52,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { ...@@ -52,6 +52,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
return nil return nil
}, InType: reflect.TypeOf(&DaemonSet{})}, }, InType: reflect.TypeOf(&DaemonSet{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetCondition).DeepCopyInto(out.(*DaemonSetCondition))
return nil
}, InType: reflect.TypeOf(&DaemonSetCondition{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList)) in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList))
return nil return nil
}, InType: reflect.TypeOf(&DaemonSetList{})}, }, InType: reflect.TypeOf(&DaemonSetList{})},
...@@ -238,6 +242,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object { ...@@ -238,6 +242,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object {
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetCondition) DeepCopyInto(out *DaemonSetCondition) {
*out = *in
in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DaemonSetCondition.
func (in *DaemonSetCondition) DeepCopy() *DaemonSetCondition {
if in == nil {
return nil
}
out := new(DaemonSetCondition)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) { func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
...@@ -319,6 +340,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) { ...@@ -319,6 +340,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) {
**out = **in **out = **in
} }
} }
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
*out = make([]DaemonSetCondition, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return return
} }
......
staging/src/k8s.io/api/apps/v1beta2/generated.proto
View file @ b0c086ee
...@@ -84,6 +84,27 @@ message DaemonSet { ...@@ -84,6 +84,27 @@ message DaemonSet {
optional DaemonSetStatus status = 3; optional DaemonSetStatus status = 3;
} }
// DaemonSetCondition describes the state of a DaemonSet at a certain point.
message DaemonSetCondition {
// Type of DaemonSet condition.
optional string type = 1;
// Status of the condition, one of True, False, Unknown.
optional string status = 2;
// Last time the condition transitioned from one status to another.
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 3;
// The reason for the condition's last transition.
// +optional
optional string reason = 4;
// A human readable message indicating details about the transition.
// +optional
optional string message = 5;
}
// DaemonSetList is a collection of daemon sets. // DaemonSetList is a collection of daemon sets.
message DaemonSetList { message DaemonSetList {
// Standard list metadata. // Standard list metadata.
...@@ -175,6 +196,12 @@ message DaemonSetStatus { ...@@ -175,6 +196,12 @@ message DaemonSetStatus {
// create the name for the newest ControllerRevision. // create the name for the newest ControllerRevision.
// +optional // +optional
optional int32 collisionCount = 9; optional int32 collisionCount = 9;
// Represents the latest available observations of a DaemonSet's current state.
// +optional
// +patchMergeKey=type
// +patchStrategy=merge
repeated DaemonSetCondition conditions = 10;
} }
// DaemonSetUpdateStrategy is a struct used to control the update strategy for a DaemonSet. // DaemonSetUpdateStrategy is a struct used to control the update strategy for a DaemonSet.
......
staging/src/k8s.io/api/apps/v1beta2/types.go
View file @ b0c086ee
...@@ -606,7 +606,7 @@ type DaemonSetStatus struct { ...@@ -606,7 +606,7 @@ type DaemonSetStatus struct {
// +optional // +optional
// +patchMergeKey=type // +patchMergeKey=type
// +patchStrategy=merge // +patchStrategy=merge
Conditions []DaemonSetCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` Conditions []DaemonSetCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,10,rep,name=conditions"`
} }
type DaemonSetConditionType string type DaemonSetConditionType string
...@@ -616,18 +616,18 @@ type DaemonSetConditionType string ...@@ -616,18 +616,18 @@ type DaemonSetConditionType string
// DaemonSetCondition describes the state of a DaemonSet at a certain point. // DaemonSetCondition describes the state of a DaemonSet at a certain point.
type DaemonSetCondition struct { type DaemonSetCondition struct {
// Type of DaemonSet condition. // Type of DaemonSet condition.
Type DaemonSetConditionType `json:"type"` Type DaemonSetConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=DaemonSetConditionType"`
// Status of the condition, one of True, False, Unknown. // Status of the condition, one of True, False, Unknown.
Status v1.ConditionStatus `json:"status"` Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"`
// Last time the condition transitioned from one status to another. // Last time the condition transitioned from one status to another.
// +optional // +optional
LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"`
// The reason for the condition's last transition. // The reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"`
// A human readable message indicating details about the transition. // A human readable message indicating details about the transition.
// +optional // +optional
Message string `json:"message,omitempty"` Message string `json:"message,omitempty" protobuf:"bytes,5,opt,name=message"`
} }
// +genclient // +genclient
......
staging/src/k8s.io/api/apps/v1beta2/types_swagger_doc_generated.go
View file @ b0c086ee
...@@ -59,6 +59,19 @@ func (DaemonSet) SwaggerDoc() map[string]string { ...@@ -59,6 +59,19 @@ func (DaemonSet) SwaggerDoc() map[string]string {
return map_DaemonSet return map_DaemonSet
} }
var map_DaemonSetCondition = map[string]string{
"": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"type": "Type of DaemonSet condition.",
"status": "Status of the condition, one of True, False, Unknown.",
"lastTransitionTime": "Last time the condition transitioned from one status to another.",
"reason": "The reason for the condition's last transition.",
"message": "A human readable message indicating details about the transition.",
}
func (DaemonSetCondition) SwaggerDoc() map[string]string {
return map_DaemonSetCondition
}
var map_DaemonSetList = map[string]string{ var map_DaemonSetList = map[string]string{
"": "DaemonSetList is a collection of daemon sets.", "": "DaemonSetList is a collection of daemon sets.",
"metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata", "metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
...@@ -93,6 +106,7 @@ var map_DaemonSetStatus = map[string]string{ ...@@ -93,6 +106,7 @@ var map_DaemonSetStatus = map[string]string{
"numberAvailable": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)", "numberAvailable": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)",
"numberUnavailable": "The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)", "numberUnavailable": "The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)",
"collisionCount": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision.", "collisionCount": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision.",
"conditions": "Represents the latest available observations of a DaemonSet's current state.",
} }
func (DaemonSetStatus) SwaggerDoc() map[string]string { func (DaemonSetStatus) SwaggerDoc() map[string]string {
......
staging/src/k8s.io/api/apps/v1beta2/zz_generated.deepcopy.go
View file @ b0c086ee
...@@ -52,6 +52,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { ...@@ -52,6 +52,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
return nil return nil
}, InType: reflect.TypeOf(&DaemonSet{})}, }, InType: reflect.TypeOf(&DaemonSet{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetCondition).DeepCopyInto(out.(*DaemonSetCondition))
return nil
}, InType: reflect.TypeOf(&DaemonSetCondition{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList)) in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList))
return nil return nil
}, InType: reflect.TypeOf(&DaemonSetList{})}, }, InType: reflect.TypeOf(&DaemonSetList{})},
...@@ -250,6 +254,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object { ...@@ -250,6 +254,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object {
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetCondition) DeepCopyInto(out *DaemonSetCondition) {
*out = *in
in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DaemonSetCondition.
func (in *DaemonSetCondition) DeepCopy() *DaemonSetCondition {
if in == nil {
return nil
}
out := new(DaemonSetCondition)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) { func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
...@@ -331,6 +352,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) { ...@@ -331,6 +352,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) {
**out = **in **out = **in
} }
} }
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
*out = make([]DaemonSetCondition, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return return
} }
......
staging/src/k8s.io/api/extensions/v1beta1/generated.proto
View file @ b0c086ee
...@@ -93,6 +93,27 @@ message DaemonSet { ...@@ -93,6 +93,27 @@ message DaemonSet {
optional DaemonSetStatus status = 3; optional DaemonSetStatus status = 3;
} }
// DaemonSetCondition describes the state of a DaemonSet at a certain point.
message DaemonSetCondition {
// Type of DaemonSet condition.
optional string type = 1;
// Status of the condition, one of True, False, Unknown.
optional string status = 2;
// Last time the condition transitioned from one status to another.
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 3;
// The reason for the condition's last transition.
// +optional
optional string reason = 4;
// A human readable message indicating details about the transition.
// +optional
optional string message = 5;
}
// DaemonSetList is a collection of daemon sets. // DaemonSetList is a collection of daemon sets.
message DaemonSetList { message DaemonSetList {
// Standard list metadata. // Standard list metadata.
...@@ -190,6 +211,12 @@ message DaemonSetStatus { ...@@ -190,6 +211,12 @@ message DaemonSetStatus {
// create the name for the newest ControllerRevision. // create the name for the newest ControllerRevision.
// +optional // +optional
optional int32 collisionCount = 9; optional int32 collisionCount = 9;
// Represents the latest available observations of a DaemonSet's current state.
// +optional
// +patchMergeKey=type
// +patchStrategy=merge
repeated DaemonSetCondition conditions = 10;
} }
message DaemonSetUpdateStrategy { message DaemonSetUpdateStrategy {
......
staging/src/k8s.io/api/extensions/v1beta1/types.go
View file @ b0c086ee
...@@ -480,7 +480,7 @@ type DaemonSetStatus struct { ...@@ -480,7 +480,7 @@ type DaemonSetStatus struct {
// +optional // +optional
// +patchMergeKey=type // +patchMergeKey=type
// +patchStrategy=merge // +patchStrategy=merge
Conditions []DaemonSetCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` Conditions []DaemonSetCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,10,rep,name=conditions"`
} }
type DaemonSetConditionType string type DaemonSetConditionType string
...@@ -490,18 +490,18 @@ type DaemonSetConditionType string ...@@ -490,18 +490,18 @@ type DaemonSetConditionType string
// DaemonSetCondition describes the state of a DaemonSet at a certain point. // DaemonSetCondition describes the state of a DaemonSet at a certain point.
type DaemonSetCondition struct { type DaemonSetCondition struct {
// Type of DaemonSet condition. // Type of DaemonSet condition.
Type DaemonSetConditionType `json:"type"` Type DaemonSetConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=DaemonSetConditionType"`
// Status of the condition, one of True, False, Unknown. // Status of the condition, one of True, False, Unknown.
Status v1.ConditionStatus `json:"status"` Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"`
// Last time the condition transitioned from one status to another. // Last time the condition transitioned from one status to another.
// +optional // +optional
LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"`
// The reason for the condition's last transition. // The reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"`
// A human readable message indicating details about the transition. // A human readable message indicating details about the transition.
// +optional // +optional
Message string `json:"message,omitempty"` Message string `json:"message,omitempty" protobuf:"bytes,5,opt,name=message"`
} }
// +genclient // +genclient
......
staging/src/k8s.io/api/extensions/v1beta1/types_swagger_doc_generated.go
View file @ b0c086ee
...@@ -66,6 +66,19 @@ func (DaemonSet) SwaggerDoc() map[string]string { ...@@ -66,6 +66,19 @@ func (DaemonSet) SwaggerDoc() map[string]string {
return map_DaemonSet return map_DaemonSet
} }
var map_DaemonSetCondition = map[string]string{
"": "DaemonSetCondition describes the state of a DaemonSet at a certain point.",
"type": "Type of DaemonSet condition.",
"status": "Status of the condition, one of True, False, Unknown.",
"lastTransitionTime": "Last time the condition transitioned from one status to another.",
"reason": "The reason for the condition's last transition.",
"message": "A human readable message indicating details about the transition.",
}
func (DaemonSetCondition) SwaggerDoc() map[string]string {
return map_DaemonSetCondition
}
var map_DaemonSetList = map[string]string{ var map_DaemonSetList = map[string]string{
"": "DaemonSetList is a collection of daemon sets.", "": "DaemonSetList is a collection of daemon sets.",
"metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata", "metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
...@@ -101,6 +114,7 @@ var map_DaemonSetStatus = map[string]string{ ...@@ -101,6 +114,7 @@ var map_DaemonSetStatus = map[string]string{
"numberAvailable": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)", "numberAvailable": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)",
"numberUnavailable": "The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)", "numberUnavailable": "The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)",
"collisionCount": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision.", "collisionCount": "Count of hash collisions for the DaemonSet. The DaemonSet controller uses this field as a collision avoidance mechanism when it needs to create the name for the newest ControllerRevision.",
"conditions": "Represents the latest available observations of a DaemonSet's current state.",
} }
func (DaemonSetStatus) SwaggerDoc() map[string]string { func (DaemonSetStatus) SwaggerDoc() map[string]string {
......
staging/src/k8s.io/api/extensions/v1beta1/zz_generated.deepcopy.go
View file @ b0c086ee
...@@ -64,6 +64,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { ...@@ -64,6 +64,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
return nil return nil
}, InType: reflect.TypeOf(&DaemonSet{})}, }, InType: reflect.TypeOf(&DaemonSet{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetCondition).DeepCopyInto(out.(*DaemonSetCondition))
return nil
}, InType: reflect.TypeOf(&DaemonSetCondition{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList)) in.(*DaemonSetList).DeepCopyInto(out.(*DaemonSetList))
return nil return nil
}, InType: reflect.TypeOf(&DaemonSetList{})}, }, InType: reflect.TypeOf(&DaemonSetList{})},
...@@ -392,6 +396,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object { ...@@ -392,6 +396,23 @@ func (in *DaemonSet) DeepCopyObject() runtime.Object {
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetCondition) DeepCopyInto(out *DaemonSetCondition) {
*out = *in
in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DaemonSetCondition.
func (in *DaemonSetCondition) DeepCopy() *DaemonSetCondition {
if in == nil {
return nil
}
out := new(DaemonSetCondition)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) { func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
...@@ -473,6 +494,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) { ...@@ -473,6 +494,13 @@ func (in *DaemonSetStatus) DeepCopyInto(out *DaemonSetStatus) {
**out = **in **out = **in
} }
} }
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
*out = make([]DaemonSetCondition, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment