github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Small updates and comment fixes

Browse Source
This commit is contained in:
Peter Schuurman 2022-10-14 15:36:30 -07:00
parent af58b491ef
commit 8a9c126eca
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/apps/types.go
View File

@ -148,8 +148,8 @@ type StatefulSetPersistentVolumeClaimRetentionPolicy struct {
type StatefulSetOrdinals struct { type StatefulSetOrdinals struct {
// Start is the number representing the first index that is used to represent // Start is the number representing the first index that is used to represent
// replica ordinals. Defaults to 0. // replica ordinals. Defaults to 0.
// If set, replica ordinals will be numbered // If set, replica ordinals will be numbered in the range:
// [.spec.ordinals.start, .spec.ordinals.start - .spec.replicas). // [.spec.ordinals.start, .spec.ordinals.start + .spec.replicas).
// +optional // +optional
Start int32 Start int32
} }

2
pkg/controller/statefulset/stateful_set_control_test.go
View File

@ -2696,7 +2696,7 @@ func checkClaimInvarients(set *apps.StatefulSet, pod *v1.Pod, claim *v1.Persiste
return fmt.Errorf("claim %s does not have owner ref on condemned pod %s for scaledown delete", claim.Name, pod.Name) return fmt.Errorf("claim %s does not have owner ref on condemned pod %s for scaledown delete", claim.Name, pod.Name)
} }
if podInOrdinalRange(pod, set) && hasOwnerRef(claim, pod) { if podInOrdinalRange(pod, set) && hasOwnerRef(claim, pod) {
return fmt.Errorf("claim %s has unexpected owner ref on condemned pod %s for scaledown delete. ordinal: %d, [%d,%d]", claim.Name, pod.Name, getOrdinal(pod), getStartOrdinal(set), getEndOrdinal(set)) return fmt.Errorf("claim %s has unexpected owner ref on condemned pod %s for scaledown delete", claim.Name, pod.Name)
} }
case policy.WhenScaled == delete && policy.WhenDeleted == delete: case policy.WhenScaled == delete && policy.WhenDeleted == delete:
if !podInOrdinalRange(pod, set) { if !podInOrdinalRange(pod, set) {

4
staging/src/k8s.io/api/apps/v1/types.go
View File

@ -168,8 +168,8 @@ type StatefulSetPersistentVolumeClaimRetentionPolicy struct {
type StatefulSetOrdinals struct { type StatefulSetOrdinals struct {
// Start is the number representing the first index that is used to represent // Start is the number representing the first index that is used to represent
// replica ordinals. Defaults to 0. // replica ordinals. Defaults to 0.
// If set, replica ordinals will be numbered // If set, replica ordinals will be numbered in the range:
// [.spec.ordinals.start, .spec.ordinals.start - .spec.replicas). // [.spec.ordinals.start, .spec.ordinals.start + .spec.replicas).
// +optional // +optional
Start int32 `json:"start" protobuf:"varint,1,opt,name=start"` Start int32 `json:"start" protobuf:"varint,1,opt,name=start"`
} }

4
staging/src/k8s.io/api/apps/v1beta1/types.go
View File

@ -209,8 +209,8 @@ type StatefulSetPersistentVolumeClaimRetentionPolicy struct {
type StatefulSetOrdinals struct { type StatefulSetOrdinals struct {
// Start is the number representing the first index that is used to represent // Start is the number representing the first index that is used to represent
// replica ordinals. Defaults to 0. // replica ordinals. Defaults to 0.
// If set, replica ordinals will be numbered // If set, replica ordinals will be numbered in the range:
// [.spec.ordinals.start, .spec.ordinals.start - .spec.replicas). // [.spec.ordinals.start, .spec.ordinals.start + .spec.replicas).
// +optional // +optional
Start int32 `json:"start" protobuf:"varint,1,opt,name=start"` Start int32 `json:"start" protobuf:"varint,1,opt,name=start"`
} }

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

@ -219,8 +219,8 @@ type StatefulSetPersistentVolumeClaimRetentionPolicy struct {
type StatefulSetOrdinals struct { type StatefulSetOrdinals struct {
// Start is the number representing the first index that is used to represent // Start is the number representing the first index that is used to represent
// replica ordinals. Defaults to 0. // replica ordinals. Defaults to 0.
// If set, replica ordinals will be numbered // If set, replica ordinals will be numbered in the range:
// [.spec.ordinals.start, .spec.ordinals.start - .spec.replicas). // [.spec.ordinals.start, .spec.ordinals.start + .spec.replicas).
// +optional // +optional
Start int32 `json:"start" protobuf:"varint,1,opt,name=start"` Start int32 `json:"start" protobuf:"varint,1,opt,name=start"`
} }