Merge pull request #6246 from aledbf/proxy

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

View file

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