Skip to content

Commit

Permalink
replace felix dir
Browse files Browse the repository at this point in the history
  • Loading branch information
oilbeater committed Dec 7, 2020
1 parent 12a6f33 commit 187332d
Show file tree
Hide file tree
Showing 147 changed files with 378 additions and 378 deletions.
20 changes: 10 additions & 10 deletions .fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ version: 1
cli:
server: https://app.fossa.io
fetcher: custom
project: https://github.com/projectcalico/felix.git
project: https://github.com/alauda/felix.git
analyze:
modules:
- name: github.com/projectcalico/felix/cmd/calico-felix
- name: github.com/alauda/felix/cmd/calico-felix
type: go
target: github.com/projectcalico/felix/cmd/calico-felix
path: /go/src/github.com/projectcalico/felix/cmd/calico-felix
target: github.com/alauda/felix/cmd/calico-felix
path: /go/src/github.com/alauda/felix/cmd/calico-felix
options:
allow-unresolved: true
- name: github.com/projectcalico/felix/fv/iptables-locker
- name: github.com/alauda/felix/fv/iptables-locker
type: go
target: github.com/projectcalico/felix/fv/iptables-locker
path: /go/src/github.com/projectcalico/felix/fv/iptables-locker
target: github.com/alauda/felix/fv/iptables-locker
path: /go/src/github.com/alauda/felix/fv/iptables-locker
options:
allow-unresolved: true
- name: github.com/projectcalico/felix/k8sfv
- name: github.com/alauda/felix/k8sfv
type: go
target: github.com/projectcalico/felix/k8sfv
path: /go/src/github.com/projectcalico/felix/k8sfv
target: github.com/alauda/felix/k8sfv
path: /go/src/github.com/alauda/felix/k8sfv
options:
allow-unresolved: true
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ VALIDARCHES = $(filter-out $(EXCLUDEARCH),$(ARCHES))
BUILD_IMAGE?=calico/felix
PUSH_IMAGES?=$(BUILD_IMAGE) quay.io/calico/felix
RELEASE_IMAGES?=
PACKAGE_NAME?=github.com/projectcalico/felix
PACKAGE_NAME?=github.com/alauda/felix

# If this is a release, also tag and push additional images.
ifeq ($(RELEASE),true)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Build Status](https://semaphoreci.com/api/v1/calico/felix-2/branches/master/shields_badge.svg)](https://semaphoreci.com/calico/felix-2)
[![Coverage Status](https://coveralls.io/repos/projectcalico/felix/badge.svg?branch=master&service=github)](https://coveralls.io/github/projectcalico/felix?branch=master)
[![Coverage Status](https://coveralls.io/repos/alauda/felix/badge.svg?branch=master&service=github)](https://coveralls.io/github/alauda/felix?branch=master)
[![Slack Status](https://slack.projectcalico.org/badge.svg)](https://slack.projectcalico.org)
[![IRC Channel](https://img.shields.io/badge/irc-%23calico-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#calico)
# Project Calico
Expand Down
6 changes: 3 additions & 3 deletions calc/active_rules_calculator.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (

log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/dispatcher"
"github.com/projectcalico/felix/labelindex"
"github.com/projectcalico/felix/multidict"
"github.com/alauda/felix/dispatcher"
"github.com/alauda/felix/labelindex"
"github.com/alauda/felix/multidict"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/selector"
Expand Down
4 changes: 2 additions & 2 deletions calc/async_calc_graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/config"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/config"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/health"
)
Expand Down
6 changes: 3 additions & 3 deletions calc/calc_graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/dispatcher"
"github.com/projectcalico/felix/labelindex"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/dispatcher"
"github.com/alauda/felix/labelindex"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/net"
Expand Down
8 changes: 4 additions & 4 deletions calc/calc_graph_fv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package calc_test

import (
. "github.com/projectcalico/felix/calc"
"github.com/projectcalico/felix/dataplane/mock"
. "github.com/alauda/felix/calc"
"github.com/alauda/felix/dataplane/mock"

"fmt"
"time"
Expand All @@ -30,8 +30,8 @@ import (

"github.com/davecgh/go-spew/spew"

"github.com/projectcalico/felix/config"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/config"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/health"
)
Expand Down
8 changes: 4 additions & 4 deletions calc/calc_graph_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package calc_test

import (
. "github.com/projectcalico/felix/calc"
. "github.com/alauda/felix/calc"

"reflect"

Expand All @@ -24,9 +24,9 @@ import (
. "github.com/onsi/gomega"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/dataplane/mock"
"github.com/projectcalico/felix/dispatcher"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/dataplane/mock"
"github.com/alauda/felix/dispatcher"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/net"
Expand Down
2 changes: 1 addition & 1 deletion calc/config_batcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package calc
import (
log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/dispatcher"
"github.com/alauda/felix/dispatcher"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
)
Expand Down
2 changes: 1 addition & 1 deletion calc/config_batcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package calc_test

import (
. "github.com/projectcalico/felix/calc"
. "github.com/alauda/felix/calc"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion calc/dataplane_passthru.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package calc
import (
log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/dispatcher"
"github.com/alauda/felix/dispatcher"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/net"
Expand Down
10 changes: 5 additions & 5 deletions calc/event_sequencer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (

"fmt"

"github.com/projectcalico/felix/config"
"github.com/projectcalico/felix/ip"
"github.com/projectcalico/felix/labelindex"
"github.com/projectcalico/felix/multidict"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/config"
"github.com/alauda/felix/ip"
"github.com/alauda/felix/labelindex"
"github.com/alauda/felix/multidict"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/net"
"github.com/projectcalico/libcalico-go/lib/set"
Expand Down
6 changes: 3 additions & 3 deletions calc/event_sequencer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"

"github.com/projectcalico/felix/calc"
"github.com/projectcalico/felix/config"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/calc"
"github.com/alauda/felix/config"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/net"
)
Expand Down
4 changes: 2 additions & 2 deletions calc/policy_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/dispatcher"
"github.com/projectcalico/felix/multidict"
"github.com/alauda/felix/dispatcher"
"github.com/alauda/felix/multidict"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/set"
Expand Down
2 changes: 1 addition & 1 deletion calc/policy_sorter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package calc_test

import (
. "github.com/projectcalico/felix/calc"
. "github.com/alauda/felix/calc"

. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions calc/profile_decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package calc
import (
"strings"

"github.com/projectcalico/felix/dispatcher"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/dispatcher"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/k8s/conversion"
"github.com/projectcalico/libcalico-go/lib/backend/model"
Expand Down
6 changes: 3 additions & 3 deletions calc/profile_decoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/projectcalico/felix/calc"
"github.com/projectcalico/felix/dispatcher"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/calc"
"github.com/alauda/felix/dispatcher"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/k8s/conversion"
"github.com/projectcalico/libcalico-go/lib/backend/model"
Expand Down
2 changes: 1 addition & 1 deletion calc/rule_convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

log "github.com/sirupsen/logrus"

"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/net"
"github.com/projectcalico/libcalico-go/lib/numorstring"
)
Expand Down
2 changes: 1 addition & 1 deletion calc/rule_convert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"

"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/apis/v3"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/net"
Expand Down
6 changes: 3 additions & 3 deletions calc/rule_scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"github.com/projectcalico/libcalico-go/lib/selector"
"github.com/projectcalico/libcalico-go/lib/set"

"github.com/projectcalico/felix/labelindex"
"github.com/projectcalico/felix/multidict"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/labelindex"
"github.com/alauda/felix/multidict"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/hash"
)

Expand Down
4 changes: 2 additions & 2 deletions calc/rule_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package calc_test

import (
. "github.com/projectcalico/felix/calc"
. "github.com/alauda/felix/calc"

"reflect"
"strings"
Expand All @@ -28,7 +28,7 @@ import (

"sort"

"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/apis/v3"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/hash"
Expand Down
4 changes: 2 additions & 2 deletions calc/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"reflect"

"github.com/projectcalico/felix/dataplane/mock"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/dataplane/mock"
"github.com/alauda/felix/proto"
"github.com/projectcalico/libcalico-go/lib/backend/api"
"github.com/projectcalico/libcalico-go/lib/backend/model"
"github.com/projectcalico/libcalico-go/lib/set"
Expand Down
4 changes: 2 additions & 2 deletions calc/states_for_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"strings"

"github.com/projectcalico/felix/dataplane/mock"
"github.com/projectcalico/felix/proto"
"github.com/alauda/felix/dataplane/mock"
"github.com/alauda/felix/proto"
. "github.com/projectcalico/libcalico-go/lib/backend/model"
)

Expand Down
2 changes: 1 addition & 1 deletion calc/stats_collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "github.com/projectcalico/felix/calc"
. "github.com/alauda/felix/calc"
"github.com/projectcalico/libcalico-go/lib/backend/api"
. "github.com/projectcalico/libcalico-go/lib/backend/model"
)
Expand Down
Loading

0 comments on commit 187332d

Please sign in to comment.