DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP Remove nginx unix sockets (#4531)

Browse source 
* Remove nginx unix sockets
* Use an emptyDir volume for /tmp in PSP e2e tests
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-09-08 18:14:54 -03:00 • committed by GitHub
parent 76e2a5d731
commit ce3e3d51c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/ingress/controller/nginx_test.go
View file

@ -151,16 +151,15 @@ func TestIsDynamicConfigurationEnough(t *testing.T) {
func TestConfigureDynamically(t *testing.T) {
listener, err := net.Listen("tcp", fmt.Sprintf(":%v", nginx.StatusPort))
if err != nil {
t.Fatalf("crating unix listener: %s", err)
t.Fatalf("crating tcp listener: %s", err)
}
defer listener.Close()
streamListener, err := net.Listen("unix", nginx.StreamSocket)
streamListener, err := net.Listen("tcp", fmt.Sprintf(":%v", nginx.StreamPort))
if err != nil {
t.Fatalf("crating unix listener: %s", err)
t.Fatalf("crating tcp listener: %s", err)
}
defer streamListener.Close()
defer os.Remove(nginx.StreamSocket)
endpointStats := map[string]int{"/configuration/backends": 0, "/configuration/general": 0, "/configuration/servers": 0}
resetEndpointStats := func() {
@ -321,16 +320,15 @@ func TestConfigureDynamically(t *testing.T) {
func TestConfigureCertificates(t *testing.T) {
listener, err := net.Listen("tcp", fmt.Sprintf(":%v", nginx.StatusPort))
if err != nil {
t.Fatalf("crating unix listener: %s", err)
t.Fatalf("crating tcp listener: %s", err)
}
defer listener.Close()
streamListener, err := net.Listen("unix", nginx.StreamSocket)
streamListener, err := net.Listen("tcp", fmt.Sprintf(":%v", nginx.StreamPort))
if err != nil {
t.Fatalf("crating unix listener: %s", err)
t.Fatalf("crating tcp listener: %s", err)
}
defer streamListener.Close()
defer os.Remove(nginx.StreamSocket)
servers := []*ingress.Server{{
Hostname: "myapp.fake",