github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #53403 from rcorre/explain_rs 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Improve explanation of ReplicaSet.

"ReplicaSet represents the configuration of a ReplicaSet" does not tell
you much. I took the explanation from
https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#when-to-use-a-replicaset



**What this PR does / why we need it**:

`kubectl explain rs` prints "ReplicaSet represents the configuration of a ReplicaSet", which is not very helpful.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
Improve explanation of ReplicaSet
```
pull/6/head
Kubernetes Submit Queue 2017-10-03 16:54:25 -07:00 committed by GitHub
parent b5ff25caf4 53939c4433
commit 72f41f1cd9
15 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/openapi-spec/swagger.json
View File

@ -62420,7 +62420,7 @@
}
},
"io.k8s.api.apps.v1beta2.ReplicaSet": {
"description": "ReplicaSet represents the configuration of a ReplicaSet.",
"description": "ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"properties": {
"apiVersion": {
"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: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
@ -70312,7 +70312,7 @@
}
},
"io.k8s.api.extensions.v1beta1.ReplicaSet": {
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet represents the configuration of a ReplicaSet.",
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"properties": {
"apiVersion": {
"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: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",

2
api/swagger-spec/apps_v1beta2.json
View File

@ -8957,7 +8957,7 @@
},
"v1beta2.ReplicaSet": {
"id": "v1beta2.ReplicaSet",
"description": "ReplicaSet represents the configuration of a ReplicaSet.",
"description": "ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"properties": {
"kind": {
"type": "string",

2
api/swagger-spec/extensions_v1beta1.json
View File

@ -10363,7 +10363,7 @@
},
"v1beta1.ReplicaSet": {
"id": "v1beta1.ReplicaSet",
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet represents the configuration of a ReplicaSet.",
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"properties": {
"kind": {
"type": "string",

2
docs/api-reference/apps/v1beta2/definitions.html
View File

@ -5051,7 +5051,7 @@ Examples:<br>
<div class="sect2">
<h3 id="_v1beta2_replicaset">v1beta2.ReplicaSet</h3>
<div class="paragraph">
<p>ReplicaSet represents the configuration of a ReplicaSet.</p>
<p>ReplicaSet ensures that a specified number of pod replicas are running at any given time.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>

2
docs/api-reference/extensions/v1beta1/definitions.html
View File

@ -6801,7 +6801,7 @@ Both these may change in the future. Incoming requests are matched against the h
<div class="sect2">
<h3 id="_v1beta1_replicaset">v1beta1.ReplicaSet</h3>
<div class="paragraph">
<p>DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet represents the configuration of a ReplicaSet.</p>
<p>DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet ensures that a specified number of pod replicas are running at any given time.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>

2
federation/apis/openapi-spec/swagger.json
View File

@ -13801,7 +13801,7 @@
}
},
"io.k8s.api.extensions.v1beta1.ReplicaSet": {
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet represents the configuration of a ReplicaSet.",
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"properties": {
"apiVersion": {
"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: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",

2
federation/apis/swagger-spec/extensions_v1beta1.json
View File

@ -8073,7 +8073,7 @@
},
"v1beta1.ReplicaSet": {
"id": "v1beta1.ReplicaSet",
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet represents the configuration of a ReplicaSet.",
"description": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"properties": {
"kind": {
"type": "string",

2
federation/docs/api-reference/extensions/v1beta1/definitions.html
View File

@ -6186,7 +6186,7 @@ Both these may change in the future. Incoming requests are matched against the h
<div class="sect2">
<h3 id="_v1beta1_replicaset">v1beta1.ReplicaSet</h3>
<div class="paragraph">
<p>DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet represents the configuration of a ReplicaSet.</p>
<p>DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet ensures that a specified number of pod replicas are running at any given time.</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>

2
pkg/apis/extensions/types.go
View File

@ -759,7 +759,7 @@ type IngressBackend struct {
// +genclient:method=UpdateScale,verb=update,subresource=scale,input=Scale,result=Scale
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// ReplicaSet represents the configuration of a replica set.
// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
type ReplicaSet struct {
metav1.TypeMeta
// +optional

2
staging/src/k8s.io/api/apps/v1beta2/generated.proto
View File

@ -336,7 +336,7 @@ message DeploymentStrategy {
optional RollingUpdateDeployment rollingUpdate = 2;
}
// ReplicaSet represents the configuration of a ReplicaSet.
// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
message ReplicaSet {
// If the Labels of a ReplicaSet are empty, they are defaulted to
// be the same as the Pod(s) that the ReplicaSet manages.

2
staging/src/k8s.io/api/apps/v1beta2/types.go
View File

@ -658,7 +658,7 @@ type DaemonSetList struct {
// +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// ReplicaSet represents the configuration of a ReplicaSet.
// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
type ReplicaSet struct {
metav1.TypeMeta `json:",inline"`

2
staging/src/k8s.io/api/apps/v1beta2/types_swagger_doc_generated.go
View File

@ -187,7 +187,7 @@ func (DeploymentStrategy) SwaggerDoc() map[string]string {
}
var map_ReplicaSet = map[string]string{
"": "ReplicaSet represents the configuration of a ReplicaSet.",
"": "ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"metadata": "If the Labels of a ReplicaSet are empty, they are defaulted to be the same as the Pod(s) that the ReplicaSet manages. Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
"spec": "Spec defines the specification of the desired behavior of the ReplicaSet. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status",
"status": "Status is the most recently observed status of the ReplicaSet. This data may be out of date by some window of time. Populated by the system. Read-only. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status",

2
staging/src/k8s.io/api/extensions/v1beta1/generated.proto
View File

@ -826,7 +826,7 @@ message PodSecurityPolicySpec {
// DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for
// more information.
// ReplicaSet represents the configuration of a ReplicaSet.
// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
message ReplicaSet {
// If the Labels of a ReplicaSet are empty, they are defaulted to
// be the same as the Pod(s) that the ReplicaSet manages.

2
staging/src/k8s.io/api/extensions/v1beta1/types.go
View File

@ -778,7 +778,7 @@ type IngressBackend struct {
// DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for
// more information.
// ReplicaSet represents the configuration of a ReplicaSet.
// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
type ReplicaSet struct {
metav1.TypeMeta `json:",inline"`

2
staging/src/k8s.io/api/extensions/v1beta1/types_swagger_doc_generated.go
View File

@ -467,7 +467,7 @@ func (PodSecurityPolicySpec) SwaggerDoc() map[string]string {
}
var map_ReplicaSet = map[string]string{
"": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet represents the configuration of a ReplicaSet.",
"": "DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for more information. ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
"metadata": "If the Labels of a ReplicaSet are empty, they are defaulted to be the same as the Pod(s) that the ReplicaSet manages. Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
"spec": "Spec defines the specification of the desired behavior of the ReplicaSet. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status",
"status": "Status is the most recently observed status of the ReplicaSet. This data may be out of date by some window of time. Populated by the system. Read-only. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status",