Merge branch 'add-opentracing-operation-name-settings' of https://github.com/JorritSalverda/ingress-nginx into add-opentracing-operation-name-settings

This commit is contained in:
Bernard Van De Walle 2020-07-23 11:42:44 -07:00
commit 2baca9e32a
5 changed files with 145 additions and 0 deletions

View file

@ -0,0 +1,109 @@
/*
Copyright 2018 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 settings
import (
"strings"
. "github.com/onsi/ginkgo"
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Configure OpenTracing", func() {
f := framework.NewDefaultFramework("enable-opentracing")
enableOpentracing := "enable-opentracing"
opentracingOperationName := "opentracing-operation-name"
opentracingLocationOperationName := "opentracing-location-operation-name"
BeforeEach(func() {
f.NewEchoDeployment()
})
AfterEach(func() {
})
It("should not exists opentracing directive", func() {
f.UpdateNginxConfigMapData(enableOpentracing, "false")
f.EnsureIngress(framework.NewSingleIngress(enableOpentracing, "/", enableOpentracing, f.Namespace, "http-svc", 80, nil))
f.WaitForNginxConfiguration(
func(cfg string) bool {
return !strings.Contains(cfg, "opentracing on")
})
})
It("should exists opentracing directive when is enabled", func() {
f.UpdateNginxConfigMapData(enableOpentracing, "true")
f.EnsureIngress(framework.NewSingleIngress(enableOpentracing, "/", enableOpentracing, f.Namespace, "http-svc", 80, nil))
f.WaitForNginxConfiguration(
func(cfg string) bool {
return strings.Contains(cfg, "opentracing on")
})
})
It("should not exists opentracing_operation_name directive when is empty", func() {
f.UpdateNginxConfigMapData(enableOpentracing, "true")
f.UpdateNginxConfigMapData(opentracingOperationName, "")
f.EnsureIngress(framework.NewSingleIngress(enableOpentracing, "/", enableOpentracing, f.Namespace, "http-svc", 80, nil))
f.WaitForNginxConfiguration(
func(cfg string) bool {
return !strings.Contains(cfg, "opentracing_operation_name")
})
})
It("should exists opentracing_operation_name directive when is configured", func() {
f.UpdateNginxConfigMapData(enableOpentracing, "true")
f.UpdateNginxConfigMapData(opentracingOperationName, "HTTP $request_method $uri")
f.EnsureIngress(framework.NewSingleIngress(enableOpentracing, "/", enableOpentracing, f.Namespace, "http-svc", 80, nil))
f.WaitForNginxConfiguration(
func(cfg string) bool {
return strings.Contains(cfg, "opentracing_operation_name \"HTTP $request_method $uri\"")
})
})
It("should not exists opentracing_operation_name directive when is empty", func() {
f.UpdateNginxConfigMapData(enableOpentracing, "true")
f.UpdateNginxConfigMapData(opentracingLocationOperationName, "")
f.EnsureIngress(framework.NewSingleIngress(enableOpentracing, "/", enableOpentracing, f.Namespace, "http-svc", 80, nil))
f.WaitForNginxConfiguration(
func(cfg string) bool {
return !strings.Contains(cfg, "opentracing_location_operation_name")
})
})
It("should exists opentracing_operation_name directive when is configured", func() {
f.UpdateNginxConfigMapData(enableOpentracing, "true")
f.UpdateNginxConfigMapData(opentracingLocationOperationName, "HTTP $request_method $uri")
f.EnsureIngress(framework.NewSingleIngress(enableOpentracing, "/", enableOpentracing, f.Namespace, "http-svc", 80, nil))
f.WaitForNginxConfiguration(
func(cfg string) bool {
return strings.Contains(cfg, "opentracing_location_operation_name \"HTTP $request_method $uri\"")
})
})
})