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

Merge pull request #5348 from Antiarchitect/stream-log-annotations

Browse source 
Ability to separately disable access log in http and stream contexts
This commit is contained in:
Kubernetes Prow Robot 2020-09-28 11:02:53 -07:00 • committed by GitHub
commit 8d45bb39a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 94 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

81
test/e2e/annotations/disableaccesslog.go Normal file
View file

@ -0,0 +1,81 @@
/*
Copyright 2020 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package annotations
import (
"strings"
"github.com/onsi/ginkgo"
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.DescribeAnnotation("disable-access-log disable-http-access-log disable-stream-access-log", func() {
f := framework.NewDefaultFramework("disableaccesslog")
ginkgo.BeforeEach(func() {
f.NewEchoDeployment()
})
ginkgo.It("disable-access-log set access_log off", func() {
host := "disableaccesslog.foo.com"
annotations := map[string]string{
"nginx.ingress.kubernetes.io/disable-access-log": "true",
}
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
f.EnsureIngress(ing)
f.WaitForNginxServer(host,
func(server string) bool {
str := `
multiline
string.`
return strings.Contains(server, `access_log off;`)
})
})
ginkgo.It("disable-http-access-log set access_log off", func() {
host := "disablehttpaccesslog.foo.com"
annotations := map[string]string{
"nginx.ingress.kubernetes.io/disable-http-access-log": "true",
}
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
f.EnsureIngress(ing)
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, `access_log off;`)
})
})
ginkgo.It("disable-stream-access-log set access_log off", func() {
host := "disablehttpaccesslog.foo.com"
annotations := map[string]string{
"nginx.ingress.kubernetes.io/disable-stream-access-log": "true",
}
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
f.EnsureIngress(ing)
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, `access_log off;`)
})
})
})