mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 17:30:00 +00:00
Merge pull request #14103 from feihujiang/fixWrongPathOfDocument
Fixes the wrong path of documents
This commit is contained in:
commit
f893245f4e
@ -141,7 +141,7 @@ type RESTMapping struct {
|
|||||||
|
|
||||||
// RESTMapper allows clients to map resources to kind, and map kind and version
|
// RESTMapper allows clients to map resources to kind, and map kind and version
|
||||||
// to interfaces for manipulating those objects. It is primarily intended for
|
// to interfaces for manipulating those objects. It is primarily intended for
|
||||||
// consumers of Kubernetes compatible REST APIs as defined in docs/api-conventions.md.
|
// consumers of Kubernetes compatible REST APIs as defined in docs/devel/api-conventions.md.
|
||||||
//
|
//
|
||||||
// The Kubernetes API provides versioned resources and object kinds which are scoped
|
// The Kubernetes API provides versioned resources and object kinds which are scoped
|
||||||
// to API groups. In other words, kinds and resources should not be assumed to be
|
// to API groups. In other words, kinds and resources should not be assumed to be
|
||||||
|
@ -1465,7 +1465,7 @@ type NodeAddress struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NodeResources is an object for conveying resource information about a node.
|
// NodeResources is an object for conveying resource information about a node.
|
||||||
// see http://docs.k8s.io/design/resources.md for more details.
|
// see http://releases.k8s.io/HEAD/docs/design/resources.md for more details.
|
||||||
type NodeResources struct {
|
type NodeResources struct {
|
||||||
// Capacity represents the available resources of a node
|
// Capacity represents the available resources of a node
|
||||||
Capacity ResourceList `json:"capacity,omitempty"`
|
Capacity ResourceList `json:"capacity,omitempty"`
|
||||||
|
@ -2650,7 +2650,7 @@ type ThirdPartyResource struct {
|
|||||||
type ThirdPartyResourceList struct {
|
type ThirdPartyResourceList struct {
|
||||||
TypeMeta `json:",inline"`
|
TypeMeta `json:",inline"`
|
||||||
// Standard list metadata.
|
// Standard list metadata.
|
||||||
// More info: http://docs.k8s.io/api-conventions.md#metadata
|
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
|
||||||
ListMeta `json:"metadata,omitempty"`
|
ListMeta `json:"metadata,omitempty"`
|
||||||
|
|
||||||
// Items is a list of schema objects.
|
// Items is a list of schema objects.
|
||||||
|
@ -1378,7 +1378,7 @@ func (ThirdPartyResourceData) SwaggerDoc() map[string]string {
|
|||||||
|
|
||||||
var map_ThirdPartyResourceList = map[string]string{
|
var map_ThirdPartyResourceList = map[string]string{
|
||||||
"": "ThirdPartyResourceList is a list of ThirdPartyResource.",
|
"": "ThirdPartyResourceList is a list of ThirdPartyResource.",
|
||||||
"metadata": "Standard list metadata. More info: http://docs.k8s.io/api-conventions.md#metadata",
|
"metadata": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
|
||||||
"items": "Items is a list of schema objects.",
|
"items": "Items is a list of schema objects.",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1412,7 +1412,7 @@ func ValidateNodeUpdate(oldNode *api.Node, node *api.Node) errs.ValidationErrorL
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Validate compute resource typename.
|
// Validate compute resource typename.
|
||||||
// Refer to docs/resources.md for more details.
|
// Refer to docs/design/resources.md for more details.
|
||||||
func validateResourceName(value string, field string) errs.ValidationErrorList {
|
func validateResourceName(value string, field string) errs.ValidationErrorList {
|
||||||
allErrs := errs.ValidationErrorList{}
|
allErrs := errs.ValidationErrorList{}
|
||||||
if !validation.IsQualifiedName(value) {
|
if !validation.IsQualifiedName(value) {
|
||||||
@ -1433,7 +1433,7 @@ func ValidateLimitRange(limitRange *api.LimitRange) errs.ValidationErrorList {
|
|||||||
allErrs := errs.ValidationErrorList{}
|
allErrs := errs.ValidationErrorList{}
|
||||||
allErrs = append(allErrs, ValidateObjectMeta(&limitRange.ObjectMeta, true, ValidateLimitRangeName).Prefix("metadata")...)
|
allErrs = append(allErrs, ValidateObjectMeta(&limitRange.ObjectMeta, true, ValidateLimitRangeName).Prefix("metadata")...)
|
||||||
|
|
||||||
// ensure resource names are properly qualified per docs/resources.md
|
// ensure resource names are properly qualified per docs/design/resources.md
|
||||||
limitTypeSet := map[api.LimitType]bool{}
|
limitTypeSet := map[api.LimitType]bool{}
|
||||||
for i := range limitRange.Spec.Limits {
|
for i := range limitRange.Spec.Limits {
|
||||||
limit := limitRange.Spec.Limits[i]
|
limit := limitRange.Spec.Limits[i]
|
||||||
|
@ -52,7 +52,7 @@ More advanced consumers may wish to provide their own transport via a http.Round
|
|||||||
}
|
}
|
||||||
client, err := client.New(config)
|
client, err := client.New(config)
|
||||||
|
|
||||||
The RESTClient type implements the Kubernetes API conventions (see `docs/api-conventions.md`)
|
The RESTClient type implements the Kubernetes API conventions (see `docs/devel/api-conventions.md`)
|
||||||
for a given API path and is intended for use by consumers implementing their own Kubernetes
|
for a given API path and is intended for use by consumers implementing their own Kubernetes
|
||||||
compatible APIs.
|
compatible APIs.
|
||||||
*/
|
*/
|
||||||
|
@ -569,7 +569,7 @@ func replaceProber(dm *DockerManager, result probe.Result, err error) {
|
|||||||
// Unknown or error.
|
// Unknown or error.
|
||||||
//
|
//
|
||||||
// PLEASE READ THE PROBE DOCS BEFORE CHANGING THIS TEST IF YOU ARE UNSURE HOW PROBES ARE SUPPOSED TO WORK:
|
// PLEASE READ THE PROBE DOCS BEFORE CHANGING THIS TEST IF YOU ARE UNSURE HOW PROBES ARE SUPPOSED TO WORK:
|
||||||
// (See https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/pod-states.md#pod-conditions)
|
// (See https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/user-guide/pod-states.md#pod-conditions)
|
||||||
func TestProbeContainer(t *testing.T) {
|
func TestProbeContainer(t *testing.T) {
|
||||||
manager, _ := newTestDockerManager()
|
manager, _ := newTestDockerManager()
|
||||||
dc := &docker.APIContainers{
|
dc := &docker.APIContainers{
|
||||||
|
@ -434,7 +434,7 @@ type Foo struct {
|
|||||||
|
|
||||||
type FooList struct {
|
type FooList struct {
|
||||||
api.TypeMeta `json:",inline"`
|
api.TypeMeta `json:",inline"`
|
||||||
api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#metadata"`
|
api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"`
|
||||||
|
|
||||||
items []Foo `json:"items"`
|
items []Foo `json:"items"`
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ type Foo struct {
|
|||||||
|
|
||||||
type FooList struct {
|
type FooList struct {
|
||||||
api.TypeMeta `json:",inline"`
|
api.TypeMeta `json:",inline"`
|
||||||
api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#metadata"`
|
api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"`
|
||||||
|
|
||||||
items []Foo `json:"items"`
|
items []Foo `json:"items"`
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ import (
|
|||||||
// certain fields with metadata that indicates whether the elements of JSON
|
// certain fields with metadata that indicates whether the elements of JSON
|
||||||
// lists should be merged or replaced.
|
// lists should be merged or replaced.
|
||||||
//
|
//
|
||||||
// For more information, see the PATCH section of docs/api-conventions.md.
|
// For more information, see the PATCH section of docs/devel/api-conventions.md.
|
||||||
//
|
//
|
||||||
// Some of the content of this package was borrowed with minor adaptations from
|
// Some of the content of this package was borrowed with minor adaptations from
|
||||||
// evanphx/json-patch and openshift/origin.
|
// evanphx/json-patch and openshift/origin.
|
||||||
|
Loading…
Reference in New Issue
Block a user