Skip to content

Commit

Permalink
Add IPv6 clusters
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
  • Loading branch information
glazychev-art committed Nov 7, 2022
1 parent d70724a commit f1e61b5
Show file tree
Hide file tree
Showing 9 changed files with 274 additions and 137 deletions.
305 changes: 221 additions & 84 deletions .github/workflows/ci.yaml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,10 @@ export KUBECONFIG3=/tmp/config3
export CLUSTER1_CIDR="172.18.1.128/25"
export CLUSTER2_CIDR="172.18.2.128/25"
export CLUSTER3_CIDR="172.18.3.128/25"

export CLUSTER1_CIDR="fc00:f853:ccd:e793:1::/80"
export CLUSTER2_CIDR="fc00:f853:ccd:e793:2::/80"
export CLUSTER3_CIDR="fc00:f853:ccd:e793:3::/80"

go test -count 1 -timeout 1h -race -v -run Interdomain
```
8 changes: 8 additions & 0 deletions cluster-config-interdomain-ipv6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
ipFamily: ipv6
nodes:
- role: control-plane
- role: worker
9 changes: 9 additions & 0 deletions cluster-config-ipv6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
ipFamily: ipv6
nodes:
- role: control-plane
- role: worker
- role: worker
17 changes: 0 additions & 17 deletions cluster-config-old.yaml

This file was deleted.

4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ go 1.16

require (
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/networkservicemesh/integration-tests v0.0.0-20221023172725-a239c379e3bd
github.com/networkservicemesh/integration-tests v0.0.0-20221031134456-995be482ed4f
github.com/stretchr/testify v1.7.0
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace github.com/networkservicemesh/integration-tests => github.com/glazychev-art/integration-tests v0.0.0-20221101084919-e98284dd268c
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/glazychev-art/integration-tests v0.0.0-20221101084919-e98284dd268c h1:cUf9Wf/5MyXjFzWBJUbAcm/sbNHuvwTIY1ABaldcrc4=
github.com/glazychev-art/integration-tests v0.0.0-20221101084919-e98284dd268c/go.mod h1:FiN76Emti1ZyhWMIG6vg6kXG//0wSCoKokBvp6i8bjM=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
Expand Down Expand Up @@ -158,8 +160,6 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc h1:1L/OisEFsOyhwaqeJpYmM1nlJ2dBusUMiszPDBlUip0=
github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc/go.mod h1:8EWnekTRNX+NxBdTFE24WqUoM7SgJHbiafDBrIIdOmQ=
github.com/networkservicemesh/integration-tests v0.0.0-20221023172725-a239c379e3bd h1:Tj3omiENebPFKr2bASNEeDBGTtxblcRum9U79uXzfPA=
github.com/networkservicemesh/integration-tests v0.0.0-20221023172725-a239c379e3bd/go.mod h1:FiN76Emti1ZyhWMIG6vg6kXG//0wSCoKokBvp6i8bjM=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down
9 changes: 4 additions & 5 deletions interdomain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ import (
"github.com/stretchr/testify/suite"

"github.com/networkservicemesh/integration-tests/suites/floating_interdomain"

"github.com/networkservicemesh/integration-tests/suites/interdomain"
)

func TestRunFloatingInterdomainSuite(t *testing.T) {
suite.Run(t, new(floating_interdomain.Suite))
}

func TestRunBasicInterdomainSuite(t *testing.T) {
suite.Run(t, new(interdomain.Suite))
}
//
//func TestRunBasicInterdomainSuite(t *testing.T) {
// suite.Run(t, new(interdomain.Suite))
//}
50 changes: 22 additions & 28 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,32 @@ import (
"github.com/stretchr/testify/suite"

"github.com/networkservicemesh/integration-tests/suites/basic"
"github.com/networkservicemesh/integration-tests/suites/features"
"github.com/networkservicemesh/integration-tests/suites/heal"
"github.com/networkservicemesh/integration-tests/suites/k8s_monolith"
"github.com/networkservicemesh/integration-tests/suites/memory"
"github.com/networkservicemesh/integration-tests/suites/observability"
"github.com/networkservicemesh/integration-tests/suites/remotevlan"
)

func TestRunHealSuiteSingle(t *testing.T) {
suite.Run(t, new(heal.Suite))
}

func TestRunFeatureSuiteSingle(t *testing.T) {
suite.Run(t, new(features.Suite))
}
//func TestRunHealSuiteSingle(t *testing.T) {
// suite.Run(t, new(heal.Suite))
//}
//
//func TestRunFeatureSuiteSingle(t *testing.T) {
// suite.Run(t, new(features.Suite))
//}

func TestRunBasicSuiteSingle(t *testing.T) {
suite.Run(t, new(basic.Suite))
}

func TestRunMemorySuiteSingle(t *testing.T) {
suite.Run(t, new(memory.Suite))
}

func TestRunRvlanSuiteSingle(t *testing.T) {
suite.Run(t, new(remotevlan.Suite))
}

func TestRunObservabilitySuiteSingle(t *testing.T) {
suite.Run(t, new(observability.Suite))
}

func TestK8sMonolithSuiteSingle(t *testing.T) {
suite.Run(t, new(k8s_monolith.Suite))
}
//func TestRunMemorySuiteSingle(t *testing.T) {
// suite.Run(t, new(memory.Suite))
//}
//
//func TestRunRvlanSuiteSingle(t *testing.T) {
// suite.Run(t, new(remotevlan.Suite))
//}
//
//func TestRunObservabilitySuiteSingle(t *testing.T) {
// suite.Run(t, new(observability.Suite))
//}
//
//func TestK8sMonolithSuiteSingle(t *testing.T) {
// suite.Run(t, new(k8s_monolith.Suite))
//}

0 comments on commit f1e61b5

Please sign in to comment.