Build NGINX v1.25 image (#10629)
This commit is contained in:
parent
c9c72c4e26
commit
ed3f067b8f
12 changed files with 1043 additions and 5 deletions
|
|
@ -17,6 +17,7 @@ limitations under the License.
|
|||
package settings
|
||||
|
||||
import (
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/onsi/ginkgo/v2"
|
||||
|
|
@ -39,6 +40,12 @@ const (
|
|||
var _ = framework.IngressNginxDescribe("Configure Opentelemetry", func() {
|
||||
f := framework.NewDefaultFramework("enable-opentelemetry")
|
||||
|
||||
shouldSkip := false
|
||||
skip, ok := os.LookupEnv("SKIP_OPENTELEMETRY_TESTS")
|
||||
if ok && skip == enable {
|
||||
shouldSkip = true
|
||||
}
|
||||
|
||||
ginkgo.BeforeEach(func() {
|
||||
f.NewEchoDeployment()
|
||||
})
|
||||
|
|
@ -47,6 +54,9 @@ var _ = framework.IngressNginxDescribe("Configure Opentelemetry", func() {
|
|||
})
|
||||
|
||||
ginkgo.It("should not exists opentelemetry directive", func() {
|
||||
if shouldSkip {
|
||||
ginkgo.Skip("skipped")
|
||||
}
|
||||
config := map[string]string{}
|
||||
config[enableOpentelemetry] = disable
|
||||
f.SetNginxConfigMapData(config)
|
||||
|
|
@ -60,6 +70,9 @@ var _ = framework.IngressNginxDescribe("Configure Opentelemetry", func() {
|
|||
})
|
||||
|
||||
ginkgo.It("should exists opentelemetry directive when is enabled", func() {
|
||||
if shouldSkip {
|
||||
ginkgo.Skip("skipped")
|
||||
}
|
||||
config := map[string]string{}
|
||||
config[enableOpentelemetry] = enable
|
||||
config[opentelemetryConfig] = opentelemetryConfigPath
|
||||
|
|
@ -74,6 +87,9 @@ var _ = framework.IngressNginxDescribe("Configure Opentelemetry", func() {
|
|||
})
|
||||
|
||||
ginkgo.It("should include opentelemetry_trust_incoming_spans on directive when enabled", func() {
|
||||
if shouldSkip {
|
||||
ginkgo.Skip("skipped")
|
||||
}
|
||||
config := map[string]string{}
|
||||
config[enableOpentelemetry] = enable
|
||||
config[opentelemetryConfig] = opentelemetryConfigPath
|
||||
|
|
@ -89,6 +105,9 @@ var _ = framework.IngressNginxDescribe("Configure Opentelemetry", func() {
|
|||
})
|
||||
|
||||
ginkgo.It("should not exists opentelemetry_operation_name directive when is empty", func() {
|
||||
if shouldSkip {
|
||||
ginkgo.Skip("skipped")
|
||||
}
|
||||
config := map[string]string{}
|
||||
config[enableOpentelemetry] = enable
|
||||
config[opentelemetryConfig] = opentelemetryConfigPath
|
||||
|
|
@ -104,6 +123,9 @@ var _ = framework.IngressNginxDescribe("Configure Opentelemetry", func() {
|
|||
})
|
||||
|
||||
ginkgo.It("should exists opentelemetry_operation_name directive when is configured", func() {
|
||||
if shouldSkip {
|
||||
ginkgo.Skip("skipped")
|
||||
}
|
||||
config := map[string]string{}
|
||||
config[enableOpentelemetry] = enable
|
||||
config[opentelemetryConfig] = opentelemetryConfigPath
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue