Skip to content

Commit

Permalink
Merge pull request kosmos-io#79 from wangyizhi1/main
Browse files Browse the repository at this point in the history 
feat: Merge the clusterlink directory
  • Loading branch information
@kosmos-robot
kosmos-robot authored Oct 3, 2023
2 parents 558cbba + 19b7be8 commit 525aee7
Show file tree
Hide file tree
Showing 98 changed files with 80 additions and 80 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ $(CMD_TARGET):
#
# Example:
# make images
# make make image-clusterlink-controller-manager
# make make image-clusterlink-controller-manager GOARCH=arm64
# make image-clusterlink-controller-manager
# make image-clusterlink-controller-manager GOARCH=arm64
IMAGE_TARGET=$(addprefix image-, $(TARGETS))
.PHONY: $(IMAGE_TARGET)
$(IMAGE_TARGET):
Expand Down
6 changes: 3 additions & 3 deletions cmd/link-agent/app/agent.go → cmd/clusterlink/agent/app/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/kosmos.io/kosmos/cmd/link-agent/app/options"
"github.com/kosmos.io/kosmos/cmd/clusterlink/agent/app/options"
linkagent "github.com/kosmos.io/kosmos/pkg/clusterlink/agent"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network"
kosmosclientset "github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned"
kosmosinformer "github.com/kosmos.io/kosmos/pkg/generated/informers/externalversions"
linkagent "github.com/kosmos.io/kosmos/pkg/link-agent"
"github.com/kosmos.io/kosmos/pkg/network"
"github.com/kosmos.io/kosmos/pkg/scheme"
"github.com/kosmos.io/kosmos/pkg/sharedcli"
"github.com/kosmos.io/kosmos/pkg/sharedcli/klogflag"
Expand Down
0 cmd/link-agent/app/options/options.go → cmd/clusterlink/agent/app/options/options.go
View file
File renamed without changes.
0 cmd/floater/app/options/validation.go → ...usterlink/agent/app/options/validation.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/network-manager/main.go → cmd/clusterlink/agent/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
apiserver "k8s.io/apiserver/pkg/server"
"k8s.io/component-base/cli"

"github.com/kosmos.io/kosmos/cmd/network-manager/app"
"github.com/kosmos.io/kosmos/cmd/clusterlink/agent/app"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions ...troller-manager/app/controller-manager.go → ...troller-manager/app/controller-manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/kosmos.io/kosmos/cmd/link-controller-manager/app/options"
"github.com/kosmos.io/kosmos/cmd/clusterlink/controller-manager/app/options"
ctrlcontext "github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/context"
"github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned"
ctrlcontext "github.com/kosmos.io/kosmos/pkg/link-controllers/context"
"github.com/kosmos.io/kosmos/pkg/scheme"
"github.com/kosmos.io/kosmos/pkg/sharedcli/klogflag"
)
Expand Down
4 changes: 2 additions & 2 deletions ...ntroller-manager/app/controllerstarter.go → ...ntroller-manager/app/controllerstarter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"github.com/kosmos.io/kosmos/cmd/link-controller-manager/app/options"
"github.com/kosmos.io/kosmos/cmd/clusterlink/controller-manager/app/options"
clusterlinkv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
ctrlcontext "github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/context"
"github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned"
"github.com/kosmos.io/kosmos/pkg/generated/informers/externalversions"
"github.com/kosmos.io/kosmos/pkg/generated/listers/kosmos/v1alpha1"
ctrlcontext "github.com/kosmos.io/kosmos/pkg/link-controllers/context"
"github.com/kosmos.io/kosmos/pkg/utils"
"github.com/kosmos.io/kosmos/pkg/utils/keys"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/link-controller-manager/app/core.go → ...lusterlink/controller-manager/app/core.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/calicoippool"
"github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/cluster"
ctrlcontext "github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/context"
"github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/node"
"github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/nodecidr"
"github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned"
"github.com/kosmos.io/kosmos/pkg/link-controllers/calicoippool"
"github.com/kosmos.io/kosmos/pkg/link-controllers/cluster"
ctrlcontext "github.com/kosmos.io/kosmos/pkg/link-controllers/context"
"github.com/kosmos.io/kosmos/pkg/link-controllers/node"
"github.com/kosmos.io/kosmos/pkg/link-controllers/nodecidr"
)

func startClusterController(ctx ctrlcontext.Context) (bool, ctrlcontext.CleanFunc, error) {
Expand Down
0 ...controller-manager/app/options/options.go → ...controller-manager/app/options/options.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/link-controller-manager/main.go → cmd/clusterlink/controller-manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"k8s.io/component-base/cli"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/kosmos.io/kosmos/cmd/link-controller-manager/app"
"github.com/kosmos.io/kosmos/cmd/clusterlink/controller-manager/app"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/link-elector/app/elector.go → cmd/clusterlink/elector/app/elector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"k8s.io/component-base/term"
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/cmd/link-elector/app/options"
"github.com/kosmos.io/kosmos/pkg/elector"
"github.com/kosmos.io/kosmos/cmd/clusterlink/elector/app/options"
"github.com/kosmos.io/kosmos/pkg/clusterlink/elector"
"github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned"
"github.com/kosmos.io/kosmos/pkg/sharedcli"
"github.com/kosmos.io/kosmos/pkg/sharedcli/klogflag"
Expand Down
0 cmd/link-elector/app/options/options.go → ...lusterlink/elector/app/options/options.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/link-elector/main.go → cmd/clusterlink/elector/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"k8s.io/component-base/cli"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/kosmos.io/kosmos/cmd/link-elector/app"
"github.com/kosmos.io/kosmos/cmd/clusterlink/elector/app"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/floater/app/floater.go → cmd/clusterlink/floater/app/floater.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"k8s.io/component-base/term"
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/cmd/floater/app/options"
"github.com/kosmos.io/kosmos/cmd/clusterlink/floater/app/options"
"github.com/kosmos.io/kosmos/pkg/sharedcli"
"github.com/kosmos.io/kosmos/pkg/sharedcli/klogflag"
)
Expand Down
0 cmd/floater/app/options/options.go → ...lusterlink/floater/app/options/options.go
View file
File renamed without changes.
0 cmd/link-agent/app/options/validation.go → ...terlink/floater/app/options/validation.go
View file
File renamed without changes.
0 cmd/floater/certificate/file.crt → cmd/clusterlink/floater/certificate/file.crt
View file
File renamed without changes.
0 cmd/floater/certificate/file.key → cmd/clusterlink/floater/certificate/file.key
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/floater/main.go → cmd/clusterlink/floater/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
apiserver "k8s.io/apiserver/pkg/server"
"k8s.io/component-base/cli"

"github.com/kosmos.io/kosmos/cmd/floater/app"
"github.com/kosmos.io/kosmos/cmd/clusterlink/floater/app"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/network-manager/app/manager.go → ...lusterlink/network-manager/app/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"k8s.io/klog/v2"
controllerruntime "sigs.k8s.io/controller-runtime"

"github.com/kosmos.io/kosmos/cmd/network-manager/app/options"
networkmanager "github.com/kosmos.io/kosmos/pkg/network-manager"
"github.com/kosmos.io/kosmos/cmd/clusterlink/network-manager/app/options"
networkmanager "github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager"
"github.com/kosmos.io/kosmos/pkg/scheme"
"github.com/kosmos.io/kosmos/pkg/sharedcli/klogflag"
)
Expand Down
0 cmd/network-manager/app/options/options.go → ...nk/network-manager/app/options/options.go
View file
File renamed without changes.
0 ...network-manager/app/options/validation.go → ...network-manager/app/options/validation.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/link-agent/main.go → cmd/clusterlink/network-manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
apiserver "k8s.io/apiserver/pkg/server"
"k8s.io/component-base/cli"

"github.com/kosmos.io/kosmos/cmd/link-agent/app"
"github.com/kosmos.io/kosmos/cmd/clusterlink/network-manager/app"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator/app/operator.go → cmd/clusterlink/operator/app/operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/kosmos.io/kosmos/cmd/operator/app/options"
"github.com/kosmos.io/kosmos/pkg/operator"
"github.com/kosmos.io/kosmos/cmd/clusterlink/operator/app/options"
"github.com/kosmos.io/kosmos/pkg/clusterlink/operator"
"github.com/kosmos.io/kosmos/pkg/scheme"
"github.com/kosmos.io/kosmos/pkg/sharedcli"
"github.com/kosmos.io/kosmos/pkg/sharedcli/klogflag"
Expand Down
0 cmd/operator/app/options/options.go → ...usterlink/operator/app/options/options.go
View file
File renamed without changes.
0 cmd/operator/app/options/validation.go → ...erlink/operator/app/options/validation.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/operator/main.go → cmd/clusterlink/operator/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
apiserver "k8s.io/apiserver/pkg/server"
"k8s.io/component-base/cli"

"github.com/kosmos.io/kosmos/cmd/operator/app"
"github.com/kosmos.io/kosmos/cmd/clusterlink/operator/app"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/link-proxy/app/clusterlink-proxy.go → ...lusterlink/proxy/app/clusterlink-proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"k8s.io/component-base/term"
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/cmd/link-proxy/app/options"
"github.com/kosmos.io/kosmos/cmd/clusterlink/proxy/app/options"
)

// NewClusterLinkProxyCommand creates a *cobra.Command object with default parameters
Expand Down
2 changes: 1 addition & 1 deletion cmd/link-proxy/app/options/options.go → cmd/clusterlink/proxy/app/options/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"k8s.io/component-base/logs"
logsapi "k8s.io/component-base/logs/api/v1"

"github.com/kosmos.io/kosmos/pkg/proxy"
"github.com/kosmos.io/kosmos/pkg/clusterlink/proxy"
)

// Options contains command line parameters for clusterlink-proxy
Expand Down
2 changes: 1 addition & 1 deletion cmd/link-proxy/main.go → cmd/clusterlink/proxy/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
apiserver "k8s.io/apiserver/pkg/server"
"k8s.io/component-base/cli"

"github.com/kosmos.io/kosmos/cmd/link-proxy/app"
"github.com/kosmos.io/kosmos/cmd/clusterlink/proxy/app"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion hack/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function build_binary_for_platform() {
set +x

if [[ "${target}" == "clusterlink-floater" ]]; then
cp -r "cmd/floater/certificate" "_output/bin/${platform}/"
cp -r "cmd/clusterlink/floater/certificate" "_output/bin/${platform}/"
fi
}

Expand Down
14 changes: 7 additions & 7 deletions hack/util.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ CLUSTERLINK_GO_PACKAGE="github.com/kosmos.io/kosmos"
MIN_Go_VERSION=go1.19.0

CLUSTERLINK_TARGET_SOURCE=(
clusterlink-proxy=cmd/link-proxy
clusterlink-operator=cmd/operator
clusterlink-elector=cmd/link-elector
clusterlink-agent=cmd/link-agent
clusterlink-controller-manager=cmd/link-controller-manager
clusterlink-proxy=cmd/clusterlink/proxy
clusterlink-operator=cmd/clusterlink/operator
clusterlink-elector=cmd/clusterlink/elector
clusterlink-agent=cmd/clusterlink/agent
clusterlink-floater=cmd/clusterlink/floater
clusterlink-network-manager=cmd/clusterlink/network-manager
clusterlink-controller-manager=cmd/clusterlink/controller-manager
kosmosctl=cmd/kosmosctl
clusterlink-floater=cmd/floater
clusterlink-network-manager=cmd/network-manager
)

#https://textkool.com/en/ascii-art-generator?hl=default&vl=default&font=DOS%20Rebel&text=KOSMOS
Expand Down
6 changes: 3 additions & 3 deletions pkg/link-agent/controller.go → pkg/clusterlink/agent/controller.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package link_agent
package agent

import (
"context"
Expand All @@ -18,9 +18,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

kosmosv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
networkmanager "github.com/kosmos.io/kosmos/pkg/clusterlink/agent/network-manager"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network"
kosmosv1alpha1lister "github.com/kosmos.io/kosmos/pkg/generated/listers/kosmos/v1alpha1"
networkmanager "github.com/kosmos.io/kosmos/pkg/link-agent/network-manager"
"github.com/kosmos.io/kosmos/pkg/network"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...-agent/network-manager/network_manager.go → .../agent/network-manager/network_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"k8s.io/klog/v2"

clusterlinkv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/network"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network"
)

var lock = &sync.RWMutex{}
Expand Down
2 changes: 1 addition & 1 deletion ...s/calicoippool/calicoippool_controller.go → ...s/calicoippool/calicoippool_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"k8s.io/klog/v2"

kosmosv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
helper "github.com/kosmos.io/kosmos/pkg/clusterlink/controllers/cluster"
"github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned"
"github.com/kosmos.io/kosmos/pkg/generated/informers/externalversions"
"github.com/kosmos.io/kosmos/pkg/generated/listers/kosmos/v1alpha1"
helper "github.com/kosmos.io/kosmos/pkg/link-controllers/cluster"
"github.com/kosmos.io/kosmos/pkg/utils"
"github.com/kosmos.io/kosmos/pkg/utils/flags"
"github.com/kosmos.io/kosmos/pkg/utils/keys"
Expand Down
0 ...icoippool/calicoippool_controller_test.go → ...icoippool/calicoippool_controller_test.go
View file
File renamed without changes.
0 ...ink-controllers/calicoippool/manifests.go → ...ink/controllers/calicoippool/manifests.go
View file
File renamed without changes.
0 ...controllers/cluster/cluster_controller.go → ...controllers/cluster/cluster_controller.go
View file
File renamed without changes.
0 pkg/link-controllers/cluster/helper.go → ...clusterlink/controllers/cluster/helper.go
View file
File renamed without changes.
0 pkg/link-controllers/context/context.go → ...lusterlink/controllers/context/context.go
View file
File renamed without changes.
0 pkg/link-controllers/node/node_controller.go → ...rlink/controllers/node/node_controller.go
View file
File renamed without changes.
0 pkg/link-controllers/nodecidr/adapter.go → ...usterlink/controllers/nodecidr/adapter.go
View file
File renamed without changes.
0 ...ntrollers/nodecidr/nodecidr_controller.go → ...ntrollers/nodecidr/nodecidr_controller.go
View file
File renamed without changes.
0 pkg/elector/elector.go → pkg/clusterlink/elector/elector.go
View file
File renamed without changes.
0 pkg/elector/elector_test.go → pkg/clusterlink/elector/elector_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/network-manager/controller.go → ...clusterlink/network-manager/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/source"

clusterlinkv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/network-manager/handlers"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/handlers"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/network-manager/handlers/context.go → ...rlink/network-manager/handlers/context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package handlers

import (
"github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/network-manager/helpers"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/helpers"
)

// Context Context
Expand Down
2 changes: 1 addition & 1 deletion pkg/network-manager/handlers/globalmap.go → ...ink/network-manager/handlers/globalmap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/helpers"
"github.com/kosmos.io/kosmos/pkg/constants"
"github.com/kosmos.io/kosmos/pkg/network-manager/helpers"
)

type GlobalMap struct {
Expand Down
0 pkg/network-manager/handlers/host_network.go → .../network-manager/handlers/host_network.go
View file
File renamed without changes.
0 pkg/network-manager/handlers/init_nodes.go → ...nk/network-manager/handlers/init_nodes.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/network-manager/handlers/nodeconfig.go → ...nk/network-manager/handlers/nodeconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/network-manager/helpers"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/helpers"
)

// NodeConfig network configuration of the node
Expand Down
2 changes: 1 addition & 1 deletion pkg/network-manager/handlers/pod_routes.go → ...nk/network-manager/handlers/pod_routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/helpers"
"github.com/kosmos.io/kosmos/pkg/constants"
"github.com/kosmos.io/kosmos/pkg/network-manager/helpers"
utilnet "github.com/kosmos.io/kosmos/pkg/utils/net"
)

Expand Down
0 pkg/network-manager/handlers/root_handler.go → .../network-manager/handlers/root_handler.go
View file
File renamed without changes.
0 pkg/network-manager/handlers/svc_routes.go → ...nk/network-manager/handlers/svc_routes.go
View file
File renamed without changes.
0 ...rk-manager/handlers/vxbridge_mac_cache.go → ...rk-manager/handlers/vxbridge_mac_cache.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...work-manager/handlers/vxbridge_network.go → ...work-manager/handlers/vxbridge_network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package handlers

import (
"github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/helpers"
"github.com/kosmos.io/kosmos/pkg/constants"
"github.com/kosmos.io/kosmos/pkg/network-manager/helpers"
)

type VxBridgeNetwork struct {
Expand Down
0 ...ork-manager/handlers/vxlocal_mac_cache.go → ...ork-manager/handlers/vxlocal_mac_cache.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...twork-manager/handlers/vxlocal_network.go → ...twork-manager/handlers/vxlocal_network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package handlers

import (
"github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/helpers"
"github.com/kosmos.io/kosmos/pkg/constants"
"github.com/kosmos.io/kosmos/pkg/network-manager/helpers"
)

type VxLocalNetwork struct {
Expand Down
0 pkg/network-manager/helpers/filter.go → ...terlink/network-manager/helpers/filter.go
View file
File renamed without changes.
0 pkg/network-manager/helpers/network.go → ...erlink/network-manager/helpers/network.go
View file
File renamed without changes.
0 pkg/network-manager/helpers/network_test.go → ...k/network-manager/helpers/network_test.go
View file
File renamed without changes.
0 pkg/network-manager/helpers/sort.go → ...usterlink/network-manager/helpers/sort.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/network-manager/network_manager.go → ...erlink/network-manager/network_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/network-manager/handlers"
"github.com/kosmos.io/kosmos/pkg/network-manager/helpers"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/handlers"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network-manager/helpers"
)

type Manager struct {
Expand Down
0 pkg/network/adapter.go → pkg/clusterlink/network/adapter.go
View file
File renamed without changes.
0 pkg/network/arp.go → pkg/clusterlink/network/arp.go
View file
File renamed without changes.
0 pkg/network/constant.go → pkg/clusterlink/network/constant.go
View file
File renamed without changes.
0 pkg/network/device.go → pkg/clusterlink/network/device.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/network/env.go → pkg/clusterlink/network/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
ipt "github.com/coreos/go-iptables/iptables"
"github.com/pkg/errors"

"github.com/kosmos.io/kosmos/pkg/network/iptables"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network/iptables"
)

func UpdateDefaultIp6tablesBehavior(ifaceName string) error {
Expand Down
0 pkg/network/fake-network/fake_network.go → ...link/network/fake-network/fake_network.go
View file
File renamed without changes.
0 pkg/network/fdb.go → pkg/clusterlink/network/fdb.go
View file
File renamed without changes.
0 pkg/network/interface.go → pkg/clusterlink/network/interface.go
View file
File renamed without changes.
0 pkg/network/ip.go → pkg/clusterlink/network/ip.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/network/iptables.go → pkg/clusterlink/network/iptables.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"k8s.io/klog/v2"

clusterlinkv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1"
"github.com/kosmos.io/kosmos/pkg/network/iptables"
"github.com/kosmos.io/kosmos/pkg/clusterlink/network/iptables"
)

type IptablesRecord struct {
Expand Down
0 pkg/network/iptables/adapter.go → pkg/clusterlink/network/iptables/adapter.go
View file
File renamed without changes.
0 pkg/network/iptables/iptables.go → pkg/clusterlink/network/iptables/iptables.go
View file
File renamed without changes.
0 pkg/network/neigh.go → pkg/clusterlink/network/neigh.go
View file
File renamed without changes.
0 pkg/network/route.go → pkg/clusterlink/network/route.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/operator/addons/agent/agent.go → ...lusterlink/operator/addons/agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/operator/addons/option"
"github.com/kosmos.io/kosmos/pkg/operator/addons/utils"
cmdutil "github.com/kosmos.io/kosmos/pkg/operator/util"
"github.com/kosmos.io/kosmos/pkg/clusterlink/operator/addons/option"
"github.com/kosmos.io/kosmos/pkg/clusterlink/operator/addons/utils"
cmdutil "github.com/kosmos.io/kosmos/pkg/clusterlink/operator/util"
utils2 "github.com/kosmos.io/kosmos/pkg/utils"
)

Expand Down
0 pkg/operator/addons/agent/manifests.go → ...erlink/operator/addons/agent/manifests.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/operator/addons/elector/elector.go → ...erlink/operator/addons/elector/elector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/operator/addons/option"
"github.com/kosmos.io/kosmos/pkg/operator/addons/utils"
cmdutil "github.com/kosmos.io/kosmos/pkg/operator/util"
"github.com/kosmos.io/kosmos/pkg/clusterlink/operator/addons/option"
"github.com/kosmos.io/kosmos/pkg/clusterlink/operator/addons/utils"
cmdutil "github.com/kosmos.io/kosmos/pkg/clusterlink/operator/util"
utils2 "github.com/kosmos.io/kosmos/pkg/utils"
)

Expand Down
0 pkg/operator/addons/elector/manifests.go → ...link/operator/addons/elector/manifests.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/operator/addons/global/global.go → ...sterlink/operator/addons/global/global.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/klog/v2"

"github.com/kosmos.io/kosmos/pkg/operator/addons/option"
"github.com/kosmos.io/kosmos/pkg/operator/addons/utils"
cmdutil "github.com/kosmos.io/kosmos/pkg/operator/util"
"github.com/kosmos.io/kosmos/pkg/clusterlink/operator/addons/option"
"github.com/kosmos.io/kosmos/pkg/clusterlink/operator/addons/utils"
cmdutil "github.com/kosmos.io/kosmos/pkg/clusterlink/operator/util"
)

type Installer struct {
Expand Down
0 pkg/operator/addons/global/manifests.go → ...rlink/operator/addons/global/manifests.go
View file
File renamed without changes.
Loading

0 comments on commit 525aee7

Please sign in to comment.