Skip to content

K
k3s
Commit f59fd3df authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #34482 from mwielgus/podanalyzer

Automatic merge from submit-queue Move pod analyzer to federated utils Both replicaset and deployment controllers are using it.
parents bcda487f 3cb8a46a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View file @ f59fd3df
...@@ -29,10 +29,10 @@ import ( ...@@ -29,10 +29,10 @@ import (
fed "k8s.io/kubernetes/federation/apis/federation" fed "k8s.io/kubernetes/federation/apis/federation"
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" 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" "k8s.io/kubernetes/federation/pkg/federation-controller/replicaset/planner"
fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" 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/eventsink"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/podanalyzer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
...@@ -435,7 +435,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation ...@@ -435,7 +435,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
if err != nil { if err != nil {
return statusError, err 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) current := make(map[string]int64)
estimatedCapacity := make(map[string]int64) estimatedCapacity := make(map[string]int64)
for _, cluster := range clusters { for _, cluster := range clusters {
......
federation/pkg/federation-controller/replicaset/replicasetcontroller.go
View file @ f59fd3df
...@@ -32,6 +32,7 @@ import ( ...@@ -32,6 +32,7 @@ import (
planner "k8s.io/kubernetes/federation/pkg/federation-controller/replicaset/planner" planner "k8s.io/kubernetes/federation/pkg/federation-controller/replicaset/planner"
fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" 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/eventsink"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/podanalyzer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
...@@ -433,7 +434,7 @@ func (frsc *ReplicaSetController) reconcileReplicaSet(key string) (reconciliatio ...@@ -433,7 +434,7 @@ func (frsc *ReplicaSetController) reconcileReplicaSet(key string) (reconciliatio
if err != nil { if err != nil {
return statusError, err 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) current := make(map[string]int64)
estimatedCapacity := make(map[string]int64) estimatedCapacity := make(map[string]int64)
for _, cluster := range clusters { for _, cluster := range clusters {
......
federation/pkg/federation-controller/replicaset/pod_helper.go → federation/pkg/federation-controller/util/podanalyzer/pod_helper.go
View file @ f59fd3df
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package replicaset package podanalyzer
import ( import (
"fmt" "fmt"
......
federation/pkg/federation-controller/replicaset/pod_helper_test.go → federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go
View file @ f59fd3df
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package replicaset package podanalyzer
import ( import (
"testing" "testing"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment