Merge pull request #4456 from aledbf/psp-mount

Fix file permissions to support volumes
This commit is contained in:
Kubernetes Prow Robot 2019-08-16 06:24:32 -07:00 committed by GitHub
commit 839076e3b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 148 additions and 18 deletions

View file

@ -37,7 +37,7 @@ func TestNginxCheck(t *testing.T) {
listener, err := net.Listen("unix", nginx.StatusSocket)
if err != nil {
t.Errorf("crating unix listener: %s", err)
t.Fatalf("crating unix listener: %s", err)
}
defer listener.Close()
defer os.Remove(nginx.StatusSocket)

View file

@ -37,6 +37,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations"
"k8s.io/ingress-nginx/internal/ingress/annotations/canary"
@ -154,6 +155,11 @@ func TestCheckIngress(t *testing.T) {
})
}()
err := file.CreateRequiredDirectories()
if err != nil {
t.Fatal(err)
}
// Ensure no panic with wrong arguments
var nginx *NGINXController
nginx.CheckIngress(nil)