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

Merge pull request #6246 from aledbf/proxy

Browse source 
Cleanup proxy protocol e2e test
This commit is contained in:
Kubernetes Prow Robot 2020-09-30 09:07:25 -07:00 committed by GitHub
commit a268ec493c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/e2e/settings/proxy_protocol.go
View file

@ -21,14 +21,14 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"net" "net"
"strings" "strings"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/test/e2e/framework" "k8s.io/ingress-nginx/test/e2e/framework"
) )
@ -153,8 +153,10 @@ var _ = framework.DescribeSetting("use-proxy-protocol", func() {
}) })
ginkgo.It("should enable PROXY Protocol for TCP", func() { ginkgo.It("should enable PROXY Protocol for TCP", func() {
f.UpdateNginxConfigMapData(setting, "true") cmapData := map[string]string{}
f.UpdateNginxConfigMapData("enable-real-ip", "true") cmapData[setting] = "true"
cmapData["enable-real-ip"] = "true"
f.SetNginxConfigMapData(cmapData)
config, err := f.KubeClientSet. config, err := f.KubeClientSet.
CoreV1(). CoreV1().