Skip to content

Commit

Permalink
fix: fix project path, issue TencentBlueKing#508
Browse files Browse the repository at this point in the history
  • Loading branch information
DeveloperJim committed Jul 1, 2020
1 parent 1f76de8 commit 0f00b66
Show file tree
Hide file tree
Showing 74 changed files with 338 additions and 205 deletions.
4 changes: 2 additions & 2 deletions bcs-common/pkg/esb/apigateway/paascc/paascc.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ package paascc
import (
"crypto/tls"

paasclient "bk-bcs/bcs-common/pkg/esb/client"
"bk-bcs/bcs-common/pkg/throttle"
paasclient "github.com/Tencent/bk-bcs/bcs-common/pkg/esb/client"
"github.com/Tencent/bk-bcs/bcs-common/pkg/throttle"
)

// ClientInterface client interface for paas-cc
Expand Down
4 changes: 2 additions & 2 deletions bcs-common/pkg/esb/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"crypto/tls"
"net/http"

"bk-bcs/bcs-common/common/http/httpclient"
"bk-bcs/bcs-common/pkg/throttle"
"github.com/Tencent/bk-bcs/bcs-common/common/http/httpclient"
"github.com/Tencent/bk-bcs/bcs-common/pkg/throttle"

"github.com/prometheus/client_golang/prometheus"
)
Expand Down
2 changes: 1 addition & 1 deletion bcs-common/pkg/esb/client/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"
"time"

"bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions bcs-common/pkg/esb/cmdbv3/cmdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"crypto/tls"
"net/http"

paasclient "bk-bcs/bcs-common/pkg/esb/client"
"bk-bcs/bcs-common/pkg/throttle"
paasclient "github.com/Tencent/bk-bcs/bcs-common/pkg/esb/client"
"github.com/Tencent/bk-bcs/bcs-common/pkg/throttle"
)

// ClientInterface client interface for cmdb
Expand Down
8 changes: 4 additions & 4 deletions bcs-k8s/bcs-cc-agent/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"os/signal"
"syscall"

"bk-bcs/bcs-common/common/blog"
"bk-bcs/bcs-common/common/encrypt"
"bk-bcs/bcs-k8s/bcs-cc-agent/config"
"bk-bcs/bcs-k8s/bcs-cc-agent/options"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/common/encrypt"
"github.com/Tencent/bk-bcs/bcs-k8s/bcs-cc-agent/config"
"github.com/Tencent/bk-bcs/bcs-k8s/bcs-cc-agent/options"
)

//Run bcs-cc-agent server
Expand Down
4 changes: 2 additions & 2 deletions bcs-k8s/bcs-cc-agent/app/cmdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
package app

import (
"bk-bcs/bcs-common/common/blog"
"bytes"
"encoding/json"
"fmt"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"io/ioutil"
"net/http"

"bk-bcs/bcs-k8s/bcs-cc-agent/config"
"github.com/Tencent/bk-bcs/bcs-k8s/bcs-cc-agent/config"
)

type PropertyFilter struct {
Expand Down
4 changes: 2 additions & 2 deletions bcs-k8s/bcs-cc-agent/app/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"reflect"
"time"

"bk-bcs/bcs-common/common/blog"
"bk-bcs/bcs-k8s/bcs-cc-agent/config"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-k8s/bcs-cc-agent/config"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
Expand Down
4 changes: 2 additions & 2 deletions bcs-k8s/bcs-cc-agent/app/mesos.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"reflect"
"time"

"bk-bcs/bcs-common/common/blog"
"bk-bcs/bcs-k8s/bcs-cc-agent/config"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-k8s/bcs-cc-agent/config"
)

var mesosCacheInfo *NodeInfo
Expand Down
2 changes: 1 addition & 1 deletion bcs-k8s/bcs-cc-agent/app/node-info.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
package app

import (
"bk-bcs/bcs-common/common/blog"
"fmt"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"io/ioutil"
"strconv"
"strings"
Expand Down
6 changes: 3 additions & 3 deletions bcs-k8s/bcs-cc-agent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"os"
"runtime"

"bk-bcs/bcs-common/common/blog"
"bk-bcs/bcs-k8s/bcs-cc-agent/app"
"bk-bcs/bcs-k8s/bcs-cc-agent/options"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-k8s/bcs-cc-agent/app"
"github.com/Tencent/bk-bcs/bcs-k8s/bcs-cc-agent/options"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion bcs-k8s/bcs-cc-agent/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package options

import (
"bk-bcs/bcs-common/common/conf"
"github.com/Tencent/bk-bcs/bcs-common/common/conf"
)

//ServerOption is option in flags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
package v4http

import (
"bk-bcs/bcs-common/common/util"
"encoding/json"
"fmt"
"github.com/Tencent/bk-bcs/bcs-common/common/util"
"github.com/emicklei/go-restful"

"bk-bcs/bcs-common/common"
"bk-bcs/bcs-common/common/blog"
bhttp "bk-bcs/bcs-common/common/http"
bcstype "bk-bcs/bcs-common/common/types"
"bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"github.com/Tencent/bk-bcs/bcs-common/common"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
bhttp "github.com/Tencent/bk-bcs/bcs-common/common/http"
bcstype "github.com/Tencent/bk-bcs/bcs-common/common/types"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/types"
)

func (s *Scheduler) createDaemonsetHandler(req *restful.Request, resp *restful.Response) {
Expand Down
10 changes: 5 additions & 5 deletions bcs-mesos/bcs-scheduler/src/manager/sched/backend/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
"fmt"
"time"

"bk-bcs/bcs-common/common/blog"
commtypes "bk-bcs/bcs-common/common/types"
"bk-bcs/bcs-mesos/bcs-scheduler/src/manager/store"
"bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"bk-bcs/bcs-mesos/bcs-scheduler/src/util"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
commtypes "github.com/Tencent/bk-bcs/bcs-common/common/types"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/manager/store"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/util"
)

//launch daemonset
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
package backend

import (
"bk-bcs/bcs-mesos/bcs-scheduler/src/util"
"errors"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/util"
"net/http"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
Expand Down
14 changes: 7 additions & 7 deletions bcs-mesos/bcs-scheduler/src/manager/sched/scheduler/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import (
"net/http"
"time"

"bk-bcs/bcs-common/common/blog"
commtypes "bk-bcs/bcs-common/common/types"
"bk-bcs/bcs-mesos/bcs-scheduler/src/manager/sched/offer"
"bk-bcs/bcs-mesos/bcs-scheduler/src/manager/sched/task"
"bk-bcs/bcs-common/pkg/scheduler/mesosproto/mesos"
"bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"bk-bcs/bcs-mesos/bcs-scheduler/src/util"
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
commtypes "github.com/Tencent/bk-bcs/bcs-common/common/types"
"github.com/Tencent/bk-bcs/bcs-common/pkg/scheduler/mesosproto/mesos"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/manager/sched/offer"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/manager/sched/task"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/util"
)

func (s *Scheduler) startBuildDaemonsets() {
Expand Down
6 changes: 3 additions & 3 deletions bcs-mesos/bcs-scheduler/src/manager/store/etcd/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
package etcd

import (
schStore "bk-bcs/bcs-mesos/bcs-scheduler/src/manager/store"
"bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"bk-bcs/bcs-mesos/pkg/apis/bkbcs/v2"
schStore "github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/manager/store"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"github.com/Tencent/bk-bcs/bcs-mesos/pkg/apis/bkbcs/v2"

"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion bcs-mesos/bcs-scheduler/src/manager/store/zk/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package zk

import (
"bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"fmt"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/types"
)

//save agent
Expand Down
2 changes: 1 addition & 1 deletion bcs-mesos/bcs-scheduler/src/types/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package types
import (
"fmt"

commtypes "bk-bcs/bcs-common/common/types"
commtypes "github.com/Tencent/bk-bcs/bcs-common/common/types"
)

//Application for container
Expand Down
2 changes: 1 addition & 1 deletion bcs-mesos/pkg/apis/bkbcs/v2/bcsdaemonset_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package v2

import (
"bk-bcs/bcs-mesos/bcs-scheduler/src/types"
"github.com/Tencent/bk-bcs/bcs-mesos/bcs-scheduler/src/types"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
8 changes: 4 additions & 4 deletions bcs-mesos/pkg/client/informers/bkbcs/v2/bcsdaemonset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bcs-mesos/pkg/client/lister/bkbcs/v2/bcsdaemonset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bcs-resources/bk-cmdb-operator/controllers/adminserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package controllers

import (
bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
"fmt"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion bcs-resources/bk-cmdb-operator/controllers/apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package controllers
import (
"fmt"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package controllers
import (
"context"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
cmdbClient "bk-bcs/bcs-resources/bk-cmdb-operator/kube/client"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
cmdbClient "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/kube/client"
"github.com/go-logr/logr"
appsv1 "k8s.io/api/apps/v1"
batchV1 "k8s.io/api/batch/v1"
Expand Down
2 changes: 1 addition & 1 deletion bcs-resources/bk-cmdb-operator/controllers/configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"text/template"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand Down
2 changes: 1 addition & 1 deletion bcs-resources/bk-cmdb-operator/controllers/coreservice.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package controllers

import (
bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
"fmt"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package controllers
import (
"fmt"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion bcs-resources/bk-cmdb-operator/controllers/eventserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package controllers
import (
"fmt"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion bcs-resources/bk-cmdb-operator/controllers/hostserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package controllers
import (
"fmt"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
3 changes: 2 additions & 1 deletion bcs-resources/bk-cmdb-operator/controllers/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ package controllers
import (
"fmt"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"

batchV1 "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 3 additions & 1 deletion bcs-resources/bk-cmdb-operator/controllers/mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
package controllers

import (
bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
"fmt"

bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"

appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ package controllers
import (
"fmt"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"

appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion bcs-resources/bk-cmdb-operator/controllers/proserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package controllers
import (
"fmt"

bkcmdbv1 "bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
bkcmdbv1 "github.com/Tencent/bk-bcs/bcs-resources/bk-cmdb-operator/api/v1"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Loading

0 comments on commit 0f00b66

Please sign in to comment.