Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit e1014c1

Browse files
committed
Use in struct service subnet to make config changes
Signed-off-by: JoshVanL <[email protected]>
1 parent f163056 commit e1014c1

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

pkg/e2e/e2e_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
)
2424

2525
const (
26-
defaultNodeImage = "1.14.0"
26+
defaultNodeImage = "1.15.0"
2727
)
2828

2929
var e2eSuite *E2E
@@ -66,26 +66,26 @@ func TestMain(m *testing.M) {
6666
klog.Fatal("kind default config set node count to 0")
6767
}
6868

69-
kubeadmConfig := `metadata:
69+
if v.Compare(v13) < 0 {
70+
kubeadmConfig := `metadata:
7071
name: config
7172
networking:
7273
serviceSubnet: 10.0.0.0/16`
7374

74-
if v.Compare(v13) >= 0 {
75-
kubeadmConfig = fmt.Sprint(`apiVersion: kubeadm.k8s.io/v1beta1
76-
kind: ClusterConfiguration
77-
`, kubeadmConfig)
78-
} else if v.Compare(v12) < 0 {
79-
kubeadmConfig = fmt.Sprint(`apiVersion: kubeadm.k8s.io/v1alpha2
75+
if v.Compare(v12) < 0 {
76+
kubeadmConfig = fmt.Sprint(`apiVersion: kubeadm.k8s.io/v1alpha2
8077
kind: MasterConfiguration
8178
`, kubeadmConfig)
82-
} else {
83-
kubeadmConfig = fmt.Sprint(`apiVersion: kubeadm.k8s.io/v1alpha3
79+
} else {
80+
kubeadmConfig = fmt.Sprint(`apiVersion: kubeadm.k8s.io/v1alpha3
8481
kind: ClusterConfiguration
8582
`, kubeadmConfig)
86-
}
83+
}
8784

88-
conf.KubeadmConfigPatches = []string{kubeadmConfig}
85+
conf.KubeadmConfigPatches = []string{kubeadmConfig}
86+
} else {
87+
conf.Networking.ServiceSubnet = "10.0.0.0/16"
88+
}
8989

9090
for i := range conf.Nodes {
9191
conf.Nodes[i].Image = nodeImage

0 commit comments

Comments
 (0)