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

Merge pull request #34482 from mwielgus/podanalyzer

Browse Source 
Automatic merge from submit-queue

Move pod analyzer to federated utils

Both replicaset and deployment controllers are using it.
This commit is contained in:
Kubernetes Submit Queue 2016-10-11 03:15:54 -07:00 committed by GitHub
commit f59fd3df8d
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View File

@ -29,10 +29,10 @@ import (
fed "k8s.io/kubernetes/federation/apis/federation"
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5"
"k8s.io/kubernetes/federation/pkg/federation-controller/replicaset"
"k8s.io/kubernetes/federation/pkg/federation-controller/replicaset/planner"
fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/podanalyzer"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
@ -435,7 +435,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
if err != nil {
return statusError, err
}
podStatus, err := replicaset.AnalysePods(fd.Spec.Selector, allPods, time.Now())
podStatus, err := podanalyzer.AnalysePods(fd.Spec.Selector, allPods, time.Now())
current := make(map[string]int64)
estimatedCapacity := make(map[string]int64)
for _, cluster := range clusters {

3
federation/pkg/federation-controller/replicaset/replicasetcontroller.go
View File

@ -32,6 +32,7 @@ import (
planner "k8s.io/kubernetes/federation/pkg/federation-controller/replicaset/planner"
fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/podanalyzer"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
@ -433,7 +434,7 @@ func (frsc *ReplicaSetController) reconcileReplicaSet(key string) (reconciliatio
if err != nil {
return statusError, err
}
podStatus, err := AnalysePods(frs.Spec.Selector, allPods, time.Now())
podStatus, err := podanalyzer.AnalysePods(frs.Spec.Selector, allPods, time.Now())
current := make(map[string]int64)
estimatedCapacity := make(map[string]int64)
for _, cluster := range clusters {

2
federation/pkg/federation-controller/replicaset/pod_helper.go → federation/pkg/federation-controller/util/podanalyzer/pod_helper.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package replicaset
package podanalyzer
import (
"fmt"

2
federation/pkg/federation-controller/replicaset/pod_helper_test.go → federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package replicaset
package podanalyzer
import (
"testing"