Skip to content

Fix import paths #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2019
Merged

Fix import paths #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76666c5
Updated import path to new repo, fixed documentation typos.
dmatch01 Oct 17, 2019
84d4f3a
Merge branch 'master' into fix-import-paths
dmatch01 Oct 17, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/kar-controllers/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"

"github.com/kubernetes-sigs/kube-batch/cmd/kar-controllers/app/options"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/queuejob"
"github.com/IBM/multi-cluster-app-dispatcher/cmd/kar-controllers/app/options"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/queuejob"

_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/kar-controllers/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package main

import (
"fmt"
"github.com/kubernetes-sigs/kube-batch/cmd/kar-controllers/app"
"github.com/kubernetes-sigs/kube-batch/cmd/kar-controllers/app/options"
"github.com/IBM/multi-cluster-app-dispatcher/cmd/kar-controllers/app"
"github.com/IBM/multi-cluster-app-dispatcher/cmd/kar-controllers/app/options"
"github.com/spf13/pflag"
"k8s.io/apiserver/pkg/util/flag"
"os"
Expand Down
2 changes: 1 addition & 1 deletion deployment/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -x

project_root=$(cd ..; pwd)
git_path=github.com/kubernetes-sigs/kube-batch
git_path=github.com/IBM/multi-cluster-app-dispatcher

container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:alpine ./build-inside-container.sh)
#container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:alpine sleep 999999999)
Expand Down
2 changes: 1 addition & 1 deletion doc/build/build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Multi-Cluster-App-Deployer Controller Build Instructions

This document will show how to build the `Multi-Cluster-App-Deployer` Kubernetes Controller that operates on on an AppWrapper kubernetes custom resource definition. It is for [master](https://github.com/IBM/multi-cluster-app-dispatcher/tree/master) branch.
This document will show how to build the `Multi-Cluster-App-Deployer` Kubernetes Controller that operates on an AppWrapper kubernetes custom resource definition. It is for [master](https://github.com/IBM/multi-cluster-app-dispatcher/tree/master) branch.

## 1. Pre-condition

Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/controller-versioned/clients/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/client-go/rest"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
)

func NewClient(cfg *rest.Config) (*rest.RESTClient, *runtime.Scheme, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/controller-versioned/clients/queuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"time"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"github.com/golang/glog"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/controller-versioned/clients/schedulingspec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"time"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"github.com/golang/glog"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/controller-versioned/clients/xqueuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"time"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"github.com/golang/glog"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/controller-versioned/clientset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package controller_versioned

import (
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/controller-versioned/typed/v1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/typed/v1"

"k8s.io/client-go/rest"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/controller-versioned/scheme/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package scheme

import (
arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/controller-versioned/typed/v1/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1

import (
v1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/clientset/controller-versioned/typed/v1/queuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package v1

import (
v1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/controller-versioned/scheme"
v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/scheme"

meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/clientset/controller-versioned/typed/v1/schedulingspec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package v1

import (
v1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/controller-versioned/scheme"
v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/scheme"

meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/clientset/controller-versioned/typed/v1/xqueuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package v1

import (
v1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/controller-versioned/scheme"
v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/scheme"

meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/informers/controller-externalversion/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"sync"
"time"

"github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion/internalinterfaces"
arbclient "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion/v1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion/internalinterfaces"
arbclient "github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion/v1"

"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/informers/controller-externalversion/generic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package controller_externalversion
import (
"fmt"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/tools/cache"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/informers/controller-externalversion/v1/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1

import (
"github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion/internalinterfaces"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion/internalinterfaces"
)

// Interface provides access to all the informers in this group version.
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/informers/controller-externalversion/v1/queuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion/internalinterfaces"
"github.com/kubernetes-sigs/kube-batch/pkg/client/listers/controller/v1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion/internalinterfaces"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/listers/controller/v1"
)

// QueueJobInformer provides access to a shared informer and lister for
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/informers/controller-externalversion/v1/schedulingspec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion/internalinterfaces"
"github.com/kubernetes-sigs/kube-batch/pkg/client/listers/controller/v1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion/internalinterfaces"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/listers/controller/v1"
)

// SchedulingSpecInformer provides access to a shared informer and lister for
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/informers/controller-externalversion/v1/xqueuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"

arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
"github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion/internalinterfaces"
"github.com/kubernetes-sigs/kube-batch/pkg/client/listers/controller/v1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion/internalinterfaces"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/listers/controller/v1"
)

//XQueueJobInformer provides access to a shared informer and lister for
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/listers/controller/v1/queuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1

import (
arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/listers/controller/v1/schedulingspec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1

import (
arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/listers/controller/v1/xqueuejob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1

import (
arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/clusterstate/api/job_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
policyv1 "k8s.io/api/policy/v1beta1"
"k8s.io/apimachinery/pkg/types"

"github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/utils"
arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/utils"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
)

type TaskID types.UID
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/clusterstate/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"

client "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/controller-versioned/clients"
informerfactory "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion"
arbclient "github.com/kubernetes-sigs/kube-batch/pkg/client/informers/controller-externalversion/v1"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/clusterstate/api"
client "github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/clients"
informerfactory "github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion"
arbclient "github.com/IBM/multi-cluster-app-dispatcher/pkg/client/informers/controller-externalversion/v1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/clusterstate/api"
)

// New returns a Cache implementation.
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/clusterstate/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

"github.com/kubernetes-sigs/kube-batch/pkg/controller/clusterstate/api"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/clusterstate/api"
)

func nodesEqual(l, r map[string]*api.NodeInfo) bool {
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/clusterstate/cache/event_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"


"github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/utils"
arbv1 "github.com/kubernetes-sigs/kube-batch/pkg/apis/controller/v1alpha1"
arbapi "github.com/kubernetes-sigs/kube-batch/pkg/controller/clusterstate/api"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/utils"
arbv1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
arbapi "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/clusterstate/api"
)

func isTerminated(status arbapi.TaskStatus) bool {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/clusterstate/cache/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package cache

import (
"github.com/kubernetes-sigs/kube-batch/pkg/controller/clusterstate/api"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/clusterstate/api"
)

// Cache collects pods/nodes/queues information
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/clusterstate/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/golang/glog"

"github.com/kubernetes-sigs/kube-batch/pkg/scheduler/framework"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/scheduler/framework"
)

var defaultSchedulerConf = map[string]string{
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/clusterstate/util/priority_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package util
import (
"container/heap"

"github.com/kubernetes-sigs/kube-batch/pkg/scheduler/api"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/scheduler/api"
)

type PriorityQueue struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/metrics/adapter/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"k8s.io/client-go/rest"
"k8s.io/apimachinery/pkg/util/wait"

adapterprov "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/adapter/provider"
basecmd "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/cmd"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider"
adapterprov "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/adapter/provider"
basecmd "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/cmd"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"

clusterstatecache "github.com/kubernetes-sigs/kube-batch/pkg/controller/clusterstate/cache"
clusterstatecache "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/clusterstate/cache"
)

// New returns a Cache implementation.
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/metrics/adapter/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
"k8s.io/metrics/pkg/apis/custom_metrics"
"k8s.io/metrics/pkg/apis/external_metrics"

clusterstatecache "github.com/kubernetes-sigs/kube-batch/pkg/controller/clusterstate/cache"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider/helpers"
clusterstatecache "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/clusterstate/cache"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider/helpers"
)

// CustomMetricResource wraps provider.CustomMetricInfo in a struct which stores the Name and Namespace of the resource
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/metrics/apiserver/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/client-go/informers"

"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
cminstall "k8s.io/metrics/pkg/apis/custom_metrics/install"
eminstall "k8s.io/metrics/pkg/apis/external_metrics/install"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/metrics/apiserver/cmapis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"k8s.io/apiserver/pkg/endpoints/discovery"
genericapiserver "k8s.io/apiserver/pkg/server"

specificapi "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/apiserver/installer"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider"
metricstorage "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/registry/custom_metrics"
specificapi "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/apiserver/installer"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
metricstorage "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/registry/custom_metrics"
"k8s.io/metrics/pkg/apis/custom_metrics"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/metrics/apiserver/emapis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"k8s.io/apiserver/pkg/endpoints/discovery"
genericapiserver "k8s.io/apiserver/pkg/server"

specificapi "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/apiserver/installer"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider"
metricstorage "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/registry/external_metrics"
specificapi "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/apiserver/installer"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
metricstorage "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/registry/external_metrics"
"k8s.io/metrics/pkg/apis/external_metrics"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/metrics/apiserver/installer/apiserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ import (
installem "k8s.io/metrics/pkg/apis/external_metrics/install"
emv1beta1 "k8s.io/metrics/pkg/apis/external_metrics/v1beta1"

"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider"
custommetricstorage "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/registry/custom_metrics"
externalmetricstorage "github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/registry/external_metrics"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
custommetricstorage "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/registry/custom_metrics"
externalmetricstorage "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/registry/external_metrics"
"k8s.io/metrics/pkg/apis/external_metrics"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/metrics/cmd/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"

"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/apiserver"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/cmd/server"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/dynamicmapper"
"github.com/kubernetes-sigs/kube-batch/pkg/controller/metrics/provider"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/apiserver"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/cmd/server"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/dynamicmapper"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
)

// AdapterBase provides a base set of functionality for any custom metrics adapter.
Expand Down
Loading