github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49619 from jianglingxia/jlx72616

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 49619, 49598, 47267, 49597, 49638)

replicaset fix typo

**What this PR does / why we need it**:
reopen #47821
**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**:
@NickrenREN 
**Release note**:

```release-note
   NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-28 05:08:01 -07:00 committed by GitHub
commit 07d7ac78a3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/controller/replicaset/replica_set_utils.go
View File

@ -126,7 +126,7 @@ func calculateStatus(rs *extensions.ReplicaSet, filteredPods []*v1.Pod, manageRe
return newStatus return newStatus
} }
// NewReplicaSetCondition creates a new replica set condition. // NewReplicaSetCondition creates a new replicaset condition.
func NewReplicaSetCondition(condType extensions.ReplicaSetConditionType, status v1.ConditionStatus, reason, msg string) extensions.ReplicaSetCondition { func NewReplicaSetCondition(condType extensions.ReplicaSetConditionType, status v1.ConditionStatus, reason, msg string) extensions.ReplicaSetCondition {
return extensions.ReplicaSetCondition{ return extensions.ReplicaSetCondition{
Type: condType, Type: condType,
@ -137,10 +137,9 @@ func NewReplicaSetCondition(condType extensions.ReplicaSetConditionType, status
} }
} }
// GetCondition returns a replica set condition with the provided type if it exists. // GetCondition returns a replicaset condition with the provided type if it exists.
func GetCondition(status extensions.ReplicaSetStatus, condType extensions.ReplicaSetConditionType) *extensions.ReplicaSetCondition { func GetCondition(status extensions.ReplicaSetStatus, condType extensions.ReplicaSetConditionType) *extensions.ReplicaSetCondition {
for i := range status.Conditions { for _, c := range status.Conditions {
c := status.Conditions[i]
if c.Type == condType { if c.Type == condType {
return &c return &c
} }
@ -148,7 +147,7 @@ func GetCondition(status extensions.ReplicaSetStatus, condType extensions.Replic
return nil return nil
} }
// SetCondition adds/replaces the given condition in the replica set status. If the condition that we // SetCondition adds/replaces the given condition in the replicaset status. If the condition that we
// are about to add already exists and has the same status and reason then we are not going to update. // are about to add already exists and has the same status and reason then we are not going to update.
func SetCondition(status *extensions.ReplicaSetStatus, condition extensions.ReplicaSetCondition) { func SetCondition(status *extensions.ReplicaSetStatus, condition extensions.ReplicaSetCondition) {
currentCond := GetCondition(*status, condition.Type) currentCond := GetCondition(*status, condition.Type)
@ -159,12 +158,12 @@ func SetCondition(status *extensions.ReplicaSetStatus, condition extensions.Repl
status.Conditions = append(newConditions, condition) status.Conditions = append(newConditions, condition)
} }
// RemoveCondition removes the condition with the provided type from the replica set status. // RemoveCondition removes the condition with the provided type from the replicaset status.
func RemoveCondition(status *extensions.ReplicaSetStatus, condType extensions.ReplicaSetConditionType) { func RemoveCondition(status *extensions.ReplicaSetStatus, condType extensions.ReplicaSetConditionType) {
status.Conditions = filterOutCondition(status.Conditions, condType) status.Conditions = filterOutCondition(status.Conditions, condType)
} }
// filterOutCondition returns a new slice of replica set conditions without conditions with the provided type. // filterOutCondition returns a new slice of replicaset conditions without conditions with the provided type.
func filterOutCondition(conditions []extensions.ReplicaSetCondition, condType extensions.ReplicaSetConditionType) []extensions.ReplicaSetCondition { func filterOutCondition(conditions []extensions.ReplicaSetCondition, condType extensions.ReplicaSetConditionType) []extensions.ReplicaSetCondition {
var newConditions []extensions.ReplicaSetCondition var newConditions []extensions.ReplicaSetCondition
for _, c := range conditions { for _, c := range conditions {