Skip to content

Commit

Permalink
Remove go.mod/go.sum from per-component directories and patch imports.
Browse files Browse the repository at this point in the history
  • Loading branch information
@caseydavenport
caseydavenport committed Dec 14, 2021
1 parent ae10e6e commit 9187172
Show file tree
Hide file tree
Showing 914 changed files with 3,523 additions and 14,222 deletions.
2 changes: 1 addition & 1 deletion apiserver/cmd/apiserver/apiserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"k8s.io/component-base/logs"
"k8s.io/klog"

"github.com/projectcalico/apiserver/cmd/apiserver/server"
"github.com/projectcalico/calico/apiserver/cmd/apiserver/server"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions apiserver/cmd/apiserver/server/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog"

"github.com/projectcalico/libcalico-go/lib/logutils"
"github.com/projectcalico/calico/libcalico-go/lib/logutils"

"github.com/projectcalico/api/pkg/openapi"
"github.com/projectcalico/apiserver/pkg/apiserver"
"github.com/projectcalico/calico/apiserver/pkg/apiserver"
)

// CalicoServerOptions contains the aggregation of configuration structs for
Expand Down
2 changes: 1 addition & 1 deletion apiserver/cmd/apiserver/server/run_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/klog"

"github.com/projectcalico/apiserver/pkg/apiserver"
"github.com/projectcalico/calico/apiserver/pkg/apiserver"
)

// PrepareServer prepares the server for execution. After invoking the caller should run RunServer.
Expand Down
2 changes: 1 addition & 1 deletion apiserver/cmd/apiserver/server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

genericoptions "k8s.io/apiserver/pkg/server/options"

"github.com/projectcalico/apiserver/pkg/apiserver"
"github.com/projectcalico/calico/apiserver/pkg/apiserver"

"k8s.io/kubernetes/pkg/util/interrupt"

Expand Down
51 changes: 0 additions & 51 deletions apiserver/go.mod
View file

This file was deleted.

1,113 changes: 0 additions & 1,113 deletions apiserver/go.sum
View file

This file was deleted.

2 changes: 1 addition & 1 deletion apiserver/pkg/apiserver/apiserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"k8s.io/client-go/rest"

v3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
calicorest "github.com/projectcalico/apiserver/pkg/registry/projectcalico/rest"
calicorest "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/rest"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/bgpconfiguration/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/bgppeer/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/caliconodestatus/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package caliconodestatus

import (
calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/clusterinformation/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"k8s.io/apiserver/pkg/registry/rest"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

type REST struct {
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/felixconfig/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/globalnetworkset/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/globalpolicy/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"

"k8s.io/apimachinery/pkg/api/meta"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/hostendpoint/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/ippool/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/ipreservation/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/kubecontrollersconfig/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/apiserver/pkg/registry/rest"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/networkpolicy/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"

"k8s.io/apimachinery/pkg/api/meta"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/networkset/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/registry/projectcalico/profile/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
)

// rest implements a RESTStorage for API services against etcd
Expand Down
34 changes: 17 additions & 17 deletions apiserver/pkg/registry/projectcalico/rest/storage_calico.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ import (
"k8s.io/apiserver/pkg/registry/rest"

calico "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
calicobgpconfiguration "github.com/projectcalico/apiserver/pkg/registry/projectcalico/bgpconfiguration"
calicobgppeer "github.com/projectcalico/apiserver/pkg/registry/projectcalico/bgppeer"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/caliconodestatus"
calicoclusterinformation "github.com/projectcalico/apiserver/pkg/registry/projectcalico/clusterinformation"
calicofelixconfig "github.com/projectcalico/apiserver/pkg/registry/projectcalico/felixconfig"
calicognetworkset "github.com/projectcalico/apiserver/pkg/registry/projectcalico/globalnetworkset"
calicogpolicy "github.com/projectcalico/apiserver/pkg/registry/projectcalico/globalpolicy"
calicohostendpoint "github.com/projectcalico/apiserver/pkg/registry/projectcalico/hostendpoint"
calicoippool "github.com/projectcalico/apiserver/pkg/registry/projectcalico/ippool"
calicoipreservation "github.com/projectcalico/apiserver/pkg/registry/projectcalico/ipreservation"
calicokubecontrollersconfig "github.com/projectcalico/apiserver/pkg/registry/projectcalico/kubecontrollersconfig"
calicopolicy "github.com/projectcalico/apiserver/pkg/registry/projectcalico/networkpolicy"
caliconetworkset "github.com/projectcalico/apiserver/pkg/registry/projectcalico/networkset"
calicoprofile "github.com/projectcalico/apiserver/pkg/registry/projectcalico/profile"
"github.com/projectcalico/apiserver/pkg/registry/projectcalico/server"
calicostorage "github.com/projectcalico/apiserver/pkg/storage/calico"
"github.com/projectcalico/apiserver/pkg/storage/etcd"
calicobgpconfiguration "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/bgpconfiguration"
calicobgppeer "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/bgppeer"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/caliconodestatus"
calicoclusterinformation "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/clusterinformation"
calicofelixconfig "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/felixconfig"
calicognetworkset "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/globalnetworkset"
calicogpolicy "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/globalpolicy"
calicohostendpoint "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/hostendpoint"
calicoippool "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/ippool"
calicoipreservation "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/ipreservation"
calicokubecontrollersconfig "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/kubecontrollersconfig"
calicopolicy "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/networkpolicy"
caliconetworkset "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/networkset"
calicoprofile "github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/profile"
"github.com/projectcalico/calico/apiserver/pkg/registry/projectcalico/server"
calicostorage "github.com/projectcalico/calico/apiserver/pkg/storage/calico"
"github.com/projectcalico/calico/apiserver/pkg/storage/etcd"
)

// RESTStorageProvider provides a factory method to create a new APIGroupInfo for
Expand Down
4 changes: 2 additions & 2 deletions apiserver/pkg/registry/projectcalico/server/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"context"
"fmt"

"github.com/projectcalico/apiserver/pkg/storage/calico"
"github.com/projectcalico/apiserver/pkg/storage/etcd"
"github.com/projectcalico/calico/apiserver/pkg/storage/calico"
"github.com/projectcalico/calico/apiserver/pkg/storage/etcd"

"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/authorization/authorizer"
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/bgpConfiguration_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"
)

// NewBGPConfigurationStorage creates a new libcalico-based storage.Interface implementation for BGPConfigurations
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/bgpPeer_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"
)

// NewBGPPeerStorage creates a new libcalico-based storage.Interface implementation for BGPPeers
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/caliconodestatus_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"k8s.io/apiserver/pkg/storage/storagebackend/factory"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"

aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
)
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/clusterInformation_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"k8s.io/apiserver/pkg/storage/storagebackend/factory"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"

aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
)
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pkg/storage/calico/converter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"k8s.io/klog"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/errors"
"github.com/projectcalico/calico/libcalico-go/lib/errors"

"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/storage"
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/felixConfig_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"
)

// NewFelixConfigurationStorage creates a new libcalico-based storage.Interface implementation for FelixConfigurations
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/globalNetworkPolicy_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"
)

// NewGlobalNetworkPolicyStorage creates a new libcalico-based storage.Interface implementation for GlobalNetworkPolicies
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/globalNetworkSet_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"
)

// NewGlobalNetworkSetStorage creates a new libcalico-based storage.Interface implementation for GlobalNetworkSets
Expand Down
6 changes: 3 additions & 3 deletions apiserver/pkg/storage/calico/hostEndpoint_storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"k8s.io/apiserver/pkg/storage/storagebackend/factory"

api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
"github.com/projectcalico/libcalico-go/lib/clientv3"
"github.com/projectcalico/libcalico-go/lib/options"
"github.com/projectcalico/libcalico-go/lib/watch"
"github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/calico/libcalico-go/lib/watch"

aapi "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
)
Expand Down
Loading

0 comments on commit 9187172

Please sign in to comment.