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

Introduce ConfigMap updating helpers into e2e/framework and retain default nginx-configuration state between tests

Browse source 
Group sublogic
This commit is contained in:
Andrew Louis 2018-04-10 14:14:36 -04:00
parent 085263f318
commit 19337f05fb
4 changed files with 114 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import (
"io/ioutil"
"net"
"strings"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@ -29,7 +28,6 @@ import (
"k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes"
"k8s.io/ingress-nginx/test/e2e/framework"
)
@ -37,20 +35,32 @@ var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
f := framework.NewDefaultFramework("proxy-protocol")
setting := "use-proxy-protocol"
var defaultNginxConfigMapData map[string]string = nil
BeforeEach(func() {
err := f.NewEchoDeployment()
Expect(err).NotTo(HaveOccurred())
if defaultNginxConfigMapData == nil {
defaultNginxConfigMapData, err = f.GetNginxConfigMapData()
Expect(err).NotTo(HaveOccurred())
Expect(defaultNginxConfigMapData).NotTo(BeNil())
}
err = f.UpdateNginxConfigMapData(setting, "false")
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
updateConfigmap(setting, "false", f.KubeClientSet)
err := f.SetNginxConfigMapData(defaultNginxConfigMapData)
Expect(err).NotTo(HaveOccurred())
})
It("should respect port passed by the PROXY Protocol", func() {
host := "proxy-protocol"
updateConfigmap(setting, "true", f.KubeClientSet)
err := f.UpdateNginxConfigMapData(setting, "true")
Expect(err).NotTo(HaveOccurred())
ing, err := f.EnsureIngress(&v1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{
@ -111,19 +121,3 @@ var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-for=192.168.0.1")))
})
})
func updateConfigmap(k, v string, c kubernetes.Interface) {
By(fmt.Sprintf("updating configuration configmap setting %v to '%v'", k, v))
config, err := c.CoreV1().ConfigMaps("ingress-nginx").Get("nginx-configuration", metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred())
Expect(config).NotTo(BeNil())
if config.Data == nil {
config.Data = map[string]string{}
}
config.Data[k] = v
_, err = c.CoreV1().ConfigMaps("ingress-nginx").Update(config)
Expect(err).NotTo(HaveOccurred())
time.Sleep(1 * time.Second)
}