mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
gcp ingress only supports ImplementationSpecific path type
This commit is contained in:
parent
7b38012e74
commit
c822a1f2c6
@ -220,7 +220,7 @@ func CreateIngressComformanceTests(jig *TestJig, ns string, annotations map[stri
|
|||||||
updatedTLSHost := "foobar.com"
|
updatedTLSHost := "foobar.com"
|
||||||
updateURLMapHost := "bar.baz.com"
|
updateURLMapHost := "bar.baz.com"
|
||||||
updateURLMapPath := "/testurl"
|
updateURLMapPath := "/testurl"
|
||||||
prefixPathType := networkingv1.PathTypePrefix
|
prefixPathType := networkingv1.PathTypeImplementationSpecific
|
||||||
// Platform agnostic list of tests that must be satisfied by all controllers
|
// Platform agnostic list of tests that must be satisfied by all controllers
|
||||||
tests := []ConformanceTests{
|
tests := []ConformanceTests{
|
||||||
{
|
{
|
||||||
|
@ -926,7 +926,7 @@ var _ = common.SIGDescribe("Ingress API", func() {
|
|||||||
ingVersion := "v1"
|
ingVersion := "v1"
|
||||||
ingClient := f.ClientSet.NetworkingV1().Ingresses(ns)
|
ingClient := f.ClientSet.NetworkingV1().Ingresses(ns)
|
||||||
|
|
||||||
prefixPathType := networkingv1.PathTypePrefix
|
prefixPathType := networkingv1.PathTypeImplementationSpecific
|
||||||
serviceBackend := &networkingv1.IngressServiceBackend{
|
serviceBackend := &networkingv1.IngressServiceBackend{
|
||||||
Name: "default-backend",
|
Name: "default-backend",
|
||||||
Port: networkingv1.ServiceBackendPort{
|
Port: networkingv1.ServiceBackendPort{
|
||||||
|
@ -360,7 +360,7 @@ func (f *IngressScaleFramework) GetFormattedLatencies() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func addTestPathToIngress(ing *networkingv1.Ingress) {
|
func addTestPathToIngress(ing *networkingv1.Ingress) {
|
||||||
prefixPathType := networkingv1.PathTypePrefix
|
prefixPathType := networkingv1.PathTypeImplementationSpecific
|
||||||
ing.Spec.Rules[0].IngressRuleValue.HTTP.Paths = append(
|
ing.Spec.Rules[0].IngressRuleValue.HTTP.Paths = append(
|
||||||
ing.Spec.Rules[0].IngressRuleValue.HTTP.Paths,
|
ing.Spec.Rules[0].IngressRuleValue.HTTP.Paths,
|
||||||
networkingv1.HTTPIngressPath{
|
networkingv1.HTTPIngressPath{
|
||||||
@ -383,7 +383,7 @@ func (f *IngressScaleFramework) createScaleTestServiceIngress(suffix string, ena
|
|||||||
}
|
}
|
||||||
|
|
||||||
func generateScaleTestIngressSpec(suffix string, enableTLS bool) *networkingv1.Ingress {
|
func generateScaleTestIngressSpec(suffix string, enableTLS bool) *networkingv1.Ingress {
|
||||||
prefixPathType := networkingv1.PathTypePrefix
|
prefixPathType := networkingv1.PathTypeImplementationSpecific
|
||||||
ing := &networkingv1.Ingress{
|
ing := &networkingv1.Ingress{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-%s", scaleTestIngressNamePrefix, suffix),
|
Name: fmt.Sprintf("%s-%s", scaleTestIngressNamePrefix, suffix),
|
||||||
|
@ -11,7 +11,7 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /foo
|
- path: /foo
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheaders-https
|
name: echoheaders-https
|
||||||
|
@ -14,7 +14,7 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /foo
|
- path: /foo
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheadersx
|
name: echoheadersx
|
||||||
@ -24,14 +24,14 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /bar
|
- path: /bar
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheadersy
|
name: echoheadersy
|
||||||
port:
|
port:
|
||||||
number: 80
|
number: 80
|
||||||
- path: /foo
|
- path: /foo
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheadersx
|
name: echoheadersx
|
||||||
|
@ -8,7 +8,7 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /test
|
- path: /test
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheaders-https
|
name: echoheaders-https
|
||||||
@ -18,7 +18,7 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /test
|
- path: /test
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheaders-https
|
name: echoheaders-https
|
||||||
@ -28,7 +28,7 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /test
|
- path: /test
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheaders-https
|
name: echoheaders-https
|
||||||
@ -38,7 +38,7 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /test
|
- path: /test
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheaders-https
|
name: echoheaders-https
|
||||||
|
@ -17,7 +17,7 @@ spec:
|
|||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /test
|
- path: /test
|
||||||
pathType: "Prefix"
|
pathType: "ImplementationSpecific"
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: echoheaders-https
|
name: echoheaders-https
|
||||||
|
Loading…
Reference in New Issue
Block a user