
* Drop v1beta1 from ingress nginx (#7156) * Drop v1beta1 from ingress nginx Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix intorstr logic in controller Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * fixing admission Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * more intorstr fixing * correct template rendering Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix e2e tests for v1 api Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix gofmt errors * This is finally working...almost there... Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Re-add removed validation of AdmissionReview * Prepare for v1.0.0-alpha.1 release Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Update changelog and matrix table for v1.0.0-alpha.1 (#7274) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * add docs for syslog feature (#7219) * Fix link to e2e-tests.md in developer-guide (#7201) * Use ENV expansion for namespace in args (#7146) Update the DaemonSet namespace references to use the `POD_NAMESPACE` environment variable in the same way that the Deployment does. * chart: using Helm builtin capabilities check (#7190) Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> * Update proper default value for HTTP2MaxConcurrentStreams in Docs (#6944) It should be 128 as documented in https://github.com/kubernetes/ingress-nginx/blob/master/internal/ingress/controller/config/config.go#L780 * Fix MaxWorkerOpenFiles calculation on high cores nodes (#7107) * Fix MaxWorkerOpenFiles calculation on high cores nodes * Add e2e test for rlimit_nofile * Fix doc for max-worker-open-files * ingress/tcp: add additional error logging on failed (#7208) * Add file containing stable release (#7313) * Handle named (non-numeric) ports correctly (#7311) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Updated v1beta1 to v1 as its deprecated (#7308) * remove mercurial from build (#7031) * Retry to download maxmind DB if it fails (#7242) * Retry to download maxmind DB if it fails. Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Add retries count arg, move retry logic into DownloadGeoLite2DB function Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Reorder parameters in DownloadGeoLite2DB Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Remove hardcoded value Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Release v1.0.0-alpha.1 * Add changelog for v1.0.0-alpha.2 * controller: ignore non-service backends (#7332) * controller: ignore non-service backends Signed-off-by: Carlos Panato <ctadeu@gmail.com> * update per feedback Signed-off-by: Carlos Panato <ctadeu@gmail.com> * fix: allow scope/tcp/udp configmap namespace to altered (#7161) * Lower webhook timeout for digital ocean (#7319) * Lower webhook timeout for digital ocean * Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29 * update OWNERS and aliases files (#7365) (#7366) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Downgrade Lua modules for s390x (#7355) Downgrade Lua modules to last known working version. * Fix IngressClass logic for newer releases (#7341) * Fix IngressClass logic for newer releases Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Change e2e tests for the new IngressClass presence * Fix chart and admission tests Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix helm chart test Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix reviews * Remove ingressclass code from admission * update tag to v1.0.0-beta.1 * update readme and changelog for v1.0.0-beta.1 * Release v1.0.0-beta.1 - helm and manifests (#7422) * Change the order of annotation just to trigger a new helm release (#7425) * [cherry-pick] Add dev-v1 branch into helm releaser (#7428) * Add dev-v1 branch into helm releaser (#7424) * chore: add link for artifacthub.io/prerelease annotations Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> * k8s job ci pipeline for dev-v1 br v1.22.0 (#7453) * k8s job ci pipeline for dev-v1 br v1.22.0 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * k8s job ci pipeline for dev-v1 br v1.21.2 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * remove v1.21.1 version Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * Add controller.watchIngressWithoutClass config option (#7459) Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com> * Release new helm chart with certgen fixed (#7478) * Update go version, modules and remove ioutil * Release new helm chart with certgen fixed * changed appversion, chartversion, TAG, image (#7490) * Fix CI conflict * Fix CI conflict * Fix build.sh from rebase process * Fix controller_test post rebase Co-authored-by: Tianhao Guo <rggth09@gmail.com> Co-authored-by: Ray <61553+rctay@users.noreply.github.com> Co-authored-by: Bill Cassidy <cassid4@gmail.com> Co-authored-by: Jintao Zhang <tao12345666333@163.com> Co-authored-by: Sathish Ramani <rsathishx87@gmail.com> Co-authored-by: Mansur Marvanov <nanorobocop@gmail.com> Co-authored-by: Matt1360 <568198+Matt1360@users.noreply.github.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com> Co-authored-by: Kundan Kumar <kundan.kumar@india.nec.com> Co-authored-by: Tom Hayward <thayward@infoblox.com> Co-authored-by: Sergey Shakuto <sshakuto@infoblox.com> Co-authored-by: Tore <tore.lonoy@gmail.com> Co-authored-by: Bouke Versteegh <info@boukeversteegh.nl> Co-authored-by: Shahid <shahid@us.ibm.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Long Wu Yuan <longwuyuan@gmail.com> Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Neha Lohia <nehapithadiya444@gmail.com> Co-authored-by: Akshit Grover <akshit.grover2016@gmail.com>
339 lines
8.9 KiB
Go
339 lines
8.9 KiB
Go
/*
|
|
Copyright 2019 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 servicebackend
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/gavv/httpexpect/v2"
|
|
"github.com/onsi/ginkgo"
|
|
"github.com/stretchr/testify/assert"
|
|
corev1 "k8s.io/api/core/v1"
|
|
networking "k8s.io/api/networking/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/util/intstr"
|
|
|
|
"k8s.io/ingress-nginx/internal/nginx"
|
|
"k8s.io/ingress-nginx/test/e2e/framework"
|
|
)
|
|
|
|
var _ = framework.IngressNginxDescribe("[Service] Type ExternalName", func() {
|
|
f := framework.NewDefaultFramework("type-externalname")
|
|
|
|
ginkgo.It("works with external name set to incomplete fqdn", func() {
|
|
f.NewEchoDeployment()
|
|
|
|
host := "echo"
|
|
|
|
svc := &corev1.Service{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: framework.HTTPBinService,
|
|
Namespace: f.Namespace,
|
|
},
|
|
Spec: corev1.ServiceSpec{
|
|
ExternalName: framework.EchoService,
|
|
Type: corev1.ServiceTypeExternalName,
|
|
},
|
|
}
|
|
|
|
f.EnsureService(svc)
|
|
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.HTTPBinService, 80, nil)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, "proxy_pass http://upstream_balancer;")
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK)
|
|
})
|
|
|
|
ginkgo.It("should return 200 for service type=ExternalName without a port defined", func() {
|
|
host := "echo"
|
|
|
|
svc := &corev1.Service{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: framework.HTTPBinService,
|
|
Namespace: f.Namespace,
|
|
},
|
|
Spec: corev1.ServiceSpec{
|
|
ExternalName: "httpbin.org",
|
|
Type: corev1.ServiceTypeExternalName,
|
|
},
|
|
}
|
|
|
|
f.EnsureService(svc)
|
|
|
|
annotations := map[string]string{
|
|
"nginx.ingress.kubernetes.io/upstream-vhost": "httpbin.org",
|
|
}
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.HTTPBinService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, "proxy_pass http://upstream_balancer;")
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK)
|
|
})
|
|
|
|
ginkgo.It("should return 200 for service type=ExternalName with a port defined", func() {
|
|
host := "echo"
|
|
|
|
svc := &corev1.Service{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: framework.HTTPBinService,
|
|
Namespace: f.Namespace,
|
|
},
|
|
Spec: corev1.ServiceSpec{
|
|
ExternalName: "httpbin.org",
|
|
Type: corev1.ServiceTypeExternalName,
|
|
Ports: []corev1.ServicePort{
|
|
{
|
|
Name: host,
|
|
Port: 80,
|
|
TargetPort: intstr.FromInt(80),
|
|
Protocol: "TCP",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
f.EnsureService(svc)
|
|
|
|
annotations := map[string]string{
|
|
"nginx.ingress.kubernetes.io/upstream-vhost": "httpbin.org",
|
|
}
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.HTTPBinService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, "proxy_pass http://upstream_balancer;")
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK)
|
|
})
|
|
|
|
ginkgo.It("should return status 502 for service type=ExternalName with an invalid host", func() {
|
|
host := "echo"
|
|
|
|
svc := &corev1.Service{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: framework.HTTPBinService,
|
|
Namespace: f.Namespace,
|
|
},
|
|
Spec: corev1.ServiceSpec{
|
|
ExternalName: "invalid.hostname",
|
|
Type: corev1.ServiceTypeExternalName,
|
|
},
|
|
}
|
|
|
|
f.EnsureService(svc)
|
|
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.HTTPBinService, 80, nil)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, "proxy_pass http://upstream_balancer;")
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
StatusRange(httpexpect.Status5xx)
|
|
})
|
|
|
|
ginkgo.It("should return 200 for service type=ExternalName using a port name", func() {
|
|
host := "echo"
|
|
|
|
svc := &corev1.Service{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: framework.HTTPBinService,
|
|
Namespace: f.Namespace,
|
|
},
|
|
Spec: corev1.ServiceSpec{
|
|
ExternalName: "httpbin.org",
|
|
Type: corev1.ServiceTypeExternalName,
|
|
Ports: []corev1.ServicePort{
|
|
{
|
|
Name: host,
|
|
Port: 80,
|
|
TargetPort: intstr.FromInt(80),
|
|
Protocol: "TCP",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
f.EnsureService(svc)
|
|
|
|
annotations := map[string]string{
|
|
"nginx.ingress.kubernetes.io/upstream-vhost": "httpbin.org",
|
|
}
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.HTTPBinService, 80, annotations)
|
|
namedBackend := networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: framework.HTTPBinService,
|
|
Port: networking.ServiceBackendPort{
|
|
Name: host,
|
|
},
|
|
},
|
|
}
|
|
ing.Spec.Rules[0].HTTP.Paths[0].Backend = namedBackend
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, "proxy_pass http://upstream_balancer;")
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK)
|
|
})
|
|
|
|
ginkgo.It("should return 200 for service type=ExternalName using FQDN with trailing dot", func() {
|
|
host := "echo"
|
|
|
|
svc := &corev1.Service{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: framework.HTTPBinService,
|
|
Namespace: f.Namespace,
|
|
},
|
|
Spec: corev1.ServiceSpec{
|
|
ExternalName: "httpbin.org.",
|
|
Type: corev1.ServiceTypeExternalName,
|
|
},
|
|
}
|
|
|
|
f.EnsureService(svc)
|
|
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.HTTPBinService, 80, nil)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, "proxy_pass http://upstream_balancer;")
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK)
|
|
})
|
|
|
|
ginkgo.It("should update the external name after a service update", func() {
|
|
host := "echo"
|
|
|
|
svc := &corev1.Service{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: framework.HTTPBinService,
|
|
Namespace: f.Namespace,
|
|
},
|
|
Spec: corev1.ServiceSpec{
|
|
ExternalName: "httpbin.org",
|
|
Type: corev1.ServiceTypeExternalName,
|
|
Ports: []corev1.ServicePort{
|
|
{
|
|
Name: host,
|
|
Port: 80,
|
|
TargetPort: intstr.FromInt(80),
|
|
Protocol: "TCP",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
f.EnsureService(svc)
|
|
|
|
annotations := map[string]string{
|
|
"nginx.ingress.kubernetes.io/upstream-vhost": "httpbin.org",
|
|
}
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.HTTPBinService, 80, annotations)
|
|
namedBackend := networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: framework.HTTPBinService,
|
|
Port: networking.ServiceBackendPort{
|
|
Name: host,
|
|
},
|
|
},
|
|
}
|
|
ing.Spec.Rules[0].HTTP.Paths[0].Backend = namedBackend
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, "proxy_pass http://upstream_balancer;")
|
|
})
|
|
|
|
body := f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Body().
|
|
Raw()
|
|
|
|
assert.Contains(ginkgo.GinkgoT(), body, `"X-Forwarded-Host": "echo"`)
|
|
|
|
svc, err := f.KubeClientSet.CoreV1().Services(f.Namespace).Get(context.TODO(), framework.HTTPBinService, metav1.GetOptions{})
|
|
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error obtaining httpbin service")
|
|
|
|
svc.Spec.ExternalName = "eu.httpbin.org"
|
|
|
|
_, err = f.KubeClientSet.CoreV1().Services(f.Namespace).Update(context.Background(), svc, metav1.UpdateOptions{})
|
|
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error updating httpbin service")
|
|
|
|
framework.Sleep()
|
|
|
|
body = f.HTTPTestClient().
|
|
GET("/get").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Body().
|
|
Raw()
|
|
|
|
assert.Contains(ginkgo.GinkgoT(), body, `"X-Forwarded-Host": "echo"`)
|
|
|
|
ginkgo.By("checking the service is updated to use eu.httpbin.org")
|
|
curlCmd := fmt.Sprintf("curl --fail --silent http://localhost:%v/configuration/backends", nginx.StatusPort)
|
|
output, err := f.ExecIngressPod(curlCmd)
|
|
assert.Nil(ginkgo.GinkgoT(), err)
|
|
assert.Contains(ginkgo.GinkgoT(), output, `{"address":"eu.httpbin.org"`)
|
|
})
|
|
})
|