Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions depot/containerstore/containerstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1146,13 +1146,18 @@ var _ = Describe("Container Store", func() {
AppPort: 8080,
ProxyPort: 61001,
},
{
AppPort: 8080,
ProxyPort: 61443,
},
{
AppPort: 9090,
ProxyPort: 61002,
},
}, []uint16{
61001,
61002,
61443,
}, nil)

containerStore = containerstore.New(
Expand Down Expand Up @@ -1198,6 +1203,8 @@ var _ = Describe("Container Store", func() {
info.MappedPorts = append(info.MappedPorts, garden.PortMapping{HostPort: 16002, ContainerPort: 61002})
case 61003:
info.MappedPorts = append(info.MappedPorts, garden.PortMapping{HostPort: 16003, ContainerPort: 61003})
case 61443:
info.MappedPorts = append(info.MappedPorts, garden.PortMapping{HostPort: 16004, ContainerPort: 61443})
default:
return info, errors.New("failed-net-in")
}
Expand All @@ -1221,7 +1228,7 @@ var _ = Describe("Container Store", func() {
Expect(err).NotTo(HaveOccurred())

containerSpec := gardenClient.CreateArgsForCall(0)
Expect(containerSpec.NetIn).To(HaveLen(4))
Expect(containerSpec.NetIn).To(HaveLen(5))
Expect(containerSpec.NetIn).To(ContainElement(garden.NetIn{
HostPort: 0, ContainerPort: 8080,
}))
Expand All @@ -1234,6 +1241,9 @@ var _ = Describe("Container Store", func() {
Expect(containerSpec.NetIn).To(ContainElement(garden.NetIn{
HostPort: 0, ContainerPort: 61002,
}))
Expect(containerSpec.NetIn).To(ContainElement(garden.NetIn{
HostPort: 0, ContainerPort: 61443,
}))
})

Context("when disabling unproxied port mappings", func() {
Expand Down Expand Up @@ -1265,13 +1275,16 @@ var _ = Describe("Container Store", func() {
Expect(err).NotTo(HaveOccurred())

containerSpec := gardenClient.CreateArgsForCall(0)
Expect(containerSpec.NetIn).To(HaveLen(2))
Expect(containerSpec.NetIn).To(HaveLen(3))
Expect(containerSpec.NetIn).To(ContainElement(garden.NetIn{
HostPort: 0, ContainerPort: 61001,
}))
Expect(containerSpec.NetIn).To(ContainElement(garden.NetIn{
HostPort: 0, ContainerPort: 61002,
}))
Expect(containerSpec.NetIn).To(ContainElement(garden.NetIn{
HostPort: 0, ContainerPort: 61443,
}))
})

It("unproxied host ports are set to 0", func() {
Expand All @@ -1283,6 +1296,11 @@ var _ = Describe("Container Store", func() {
HostPort: 0,
ContainerTLSProxyPort: 61001,
HostTLSProxyPort: 16001,
}, executor.PortMapping{
ContainerPort: 8080,
HostPort: 0,
ContainerTLSProxyPort: 61443,
HostTLSProxyPort: 16004,
}, executor.PortMapping{
ContainerPort: 9090,
HostPort: 0,
Expand All @@ -1301,6 +1319,11 @@ var _ = Describe("Container Store", func() {
HostPort: 16000,
ContainerTLSProxyPort: 61001,
HostTLSProxyPort: 16001,
}, executor.PortMapping{
ContainerPort: 8080,
HostPort: 16000,
ContainerTLSProxyPort: 61443,
HostTLSProxyPort: 16004,
}, executor.PortMapping{
ContainerPort: 9090,
HostPort: 16004,
Expand All @@ -1318,7 +1341,7 @@ var _ = Describe("Container Store", func() {
Expect(containerStore.Run(logger, containerGuid)).NotTo(HaveOccurred())
Eventually(megatron.StepsRunnerCallCount).Should(Equal(1))
_, _, _, _, cfg := megatron.StepsRunnerArgsForCall(0)
Expect(cfg.ProxyTLSPorts).To(ConsistOf(uint16(61001), uint16(61002)))
Expect(cfg.ProxyTLSPorts).To(ConsistOf(uint16(61001), uint16(61002), uint16(61443)))
})

It("bind mounts envoy", func() {
Expand Down
24 changes: 12 additions & 12 deletions depot/containerstore/containerstorefakes/fake_cred_handler.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions depot/containerstore/containerstorefakes/fake_proxymanager.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading