scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pod analyzer to utils

Browse Source
This commit is contained in:
Marcin Wielgus
2016-10-10 21:09:30 +02:00
parent e72f26a3ff
commit 3cb8a46a1e
4 changed files with 6 additions and 5 deletions
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"
@@ -445,7 +445,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"
@@ -440,7 +441,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"