Skip to content

Commit

Permalink
Merge pull request #54 from GunjiD/fix-typo
Browse files Browse the repository at this point in the history
Fix typo: "mutiple" to "multiple" in flannel_linux_test.go
  • Loading branch information
thomasferrandiz authored Nov 29, 2023
2 parents a35bc4b + 9f9ea24 commit 0038017
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions flannel_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ import (

var _ = Describe("Flannel", func() {
var (
originalNS ns.NetNS
onlyIpv4Input string
onlyIpv6Input string
dualStackInput string
onlyIpv4MutipleNetworksInput string
onlyIpv4SubnetFile string
onlyIpv6SubnetFile string
dualStackSubnetFile string
onlyIpv4MutipleNetworksSubnetFile string
dataDir string
originalNS ns.NetNS
onlyIpv4Input string
onlyIpv6Input string
dualStackInput string
onlyIpv4MultipleNetworksInput string
onlyIpv4SubnetFile string
onlyIpv6SubnetFile string
dualStackSubnetFile string
onlyIpv4MultipleNetworksSubnetFile string
dataDir string
)

BeforeEach(func() {
Expand Down Expand Up @@ -132,22 +132,22 @@ FLANNEL_IPMASQ=true
onlyIpv4SubnetFile = writeSubnetEnv(onlyIpv4FlannelSubnetEnv)
onlyIpv6SubnetFile = writeSubnetEnv(onlyIpv6FlannelSubnetEnv)
dualStackSubnetFile = writeSubnetEnv(dualStackFlannelSubnetEnv)
onlyIpv4MutipleNetworksSubnetFile = writeSubnetEnv(onlyIpv4MultipleNetworksFlannelSubnetEnv)
onlyIpv4MultipleNetworksSubnetFile = writeSubnetEnv(onlyIpv4MultipleNetworksFlannelSubnetEnv)

// flannel state dir
dataDir, err = os.MkdirTemp("", "dataDir")
Expect(err).NotTo(HaveOccurred())
onlyIpv4Input = makeInput("", onlyIpv4SubnetFile)
onlyIpv6Input = makeInput("", onlyIpv6SubnetFile)
dualStackInput = makeInput("", dualStackSubnetFile)
onlyIpv4MutipleNetworksInput = makeInput("", onlyIpv4MutipleNetworksSubnetFile)
onlyIpv4MultipleNetworksInput = makeInput("", onlyIpv4MultipleNetworksSubnetFile)
})

AfterEach(func() {
os.Remove(onlyIpv4SubnetFile)
os.Remove(onlyIpv6SubnetFile)
os.Remove(dualStackSubnetFile)
os.Remove(onlyIpv4MutipleNetworksSubnetFile)
os.Remove(onlyIpv4MultipleNetworksSubnetFile)
os.RemoveAll(dataDir)
os.RemoveAll(hostLocalDataDir)
})
Expand Down Expand Up @@ -244,7 +244,7 @@ FLANNEL_IPMASQ=true
ContainerID: "some-container-id-ipv4-multiple",
Netns: targetNs.Path(),
IfName: IFNAME,
StdinData: []byte(onlyIpv4MutipleNetworksInput),
StdinData: []byte(onlyIpv4MultipleNetworksInput),
}

err = originalNS.Do(func(ns.NetNS) error {
Expand Down Expand Up @@ -664,12 +664,12 @@ FLANNEL_IPMASQ=true
Context("when input IPAM is provided with two networks ipv4 stack", func() {
BeforeEach(func() {
inputIPAM := makeInputIPAM("host-local", "", "")
onlyIpv4Input = makeInput(inputIPAM, onlyIpv4MutipleNetworksSubnetFile)
onlyIpv4Input = makeInput(inputIPAM, onlyIpv4MultipleNetworksSubnetFile)
})
It("configures Delegate IPAM accordingly with two routes in ipv4 stack", func() {
conf, err := loadFlannelNetConf([]byte(onlyIpv4MutipleNetworksInput))
conf, err := loadFlannelNetConf([]byte(onlyIpv4MultipleNetworksInput))
Expect(err).ShouldNot(HaveOccurred())
fenv, err := loadFlannelSubnetEnv(onlyIpv4MutipleNetworksSubnetFile)
fenv, err := loadFlannelSubnetEnv(onlyIpv4MultipleNetworksSubnetFile)
Expect(err).ShouldNot(HaveOccurred())

ipam, err := getDelegateIPAM(conf, fenv)
Expand Down

0 comments on commit 0038017

Please sign in to comment.