dataclients/kubernetes: disable network backend address validation

Disable address validation to prevent errors for existing RouteGroups. Reverts #2719 Signed-off-by: Alexander Yastrebov <[email protected]>
zalando · Dec 6, 2023 · f3ed9fa · f3ed9fa
1 parent f67dd0e
commit f3ed9fa
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 117 deletions.
diff --git a/cmd/webhook/admission/admission_test.go b/cmd/webhook/admission/admission_test.go
@@ -133,11 +133,6 @@ func TestRouteGroupAdmitter(t *testing.T) {
 			inputFile: "rg-with-multiple-predicates.json",
 			message:   `single predicate expected at \"Method(\\\"GET\\\") && Path(\\\"/\\\")\"\nsingle predicate expected at \" \"`,
 		},
-		{
-			name:      "routegroup with invalid backends",
-			inputFile: "rg-with-invalid-backend-path.json",
-			message:   `backend address \"http://example.com/foo\" does not match scheme://host format\nbackend address \"http://example.com/foo/bar\" does not match scheme://host format\nbackend address \"http://example.com/foo/\" does not match scheme://host format\nbackend address \"/foo\" does not match scheme://host format\nbackend address \"http://example.com/\" does not match scheme://host format\nbackend address \"example.com/\" does not match scheme://host format\nbackend address \"example.com/foo\" does not match scheme://host format\nbackend address \"http://example.com?foo=bar\" does not match scheme://host format\nbackend address \"example.com\" does not match scheme://host format`,
-		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			expectedResponse := responseAllowedFmt

diff --git a/dataclients/kubernetes/definitions/routegroupvalidator.go b/dataclients/kubernetes/definitions/routegroupvalidator.go
@@ -38,7 +38,7 @@ func (rgv *RouteGroupValidator) Validate(item *RouteGroupItem) error {
 	var errs []error
 	errs = append(errs, rgv.validateFilters(item))
 	errs = append(errs, rgv.validatePredicates(item))
-	errs = append(errs, rgv.validateBackends(item))
+	// errs = append(errs, rgv.validateBackends(item))
 
 	return errorsJoin(errs...)
 }

diff --git a/dataclients/kubernetes/definitions/testdata/errorwrapdata/errors.log b/dataclients/kubernetes/definitions/testdata/errorwrapdata/errors.log
@@ -4,10 +4,3 @@ single predicate expected at "Path(\"/foo\") && Method(\"GET\")"
 single predicate expected at ""
 single filter expected at "inlineContent(\"/foo\") -> status(200)"
 single filter expected at " "
-backend address "http://example.com/foo" does not match scheme://host format
-backend address "http://example.com/foo/bar" does not match scheme://host format
-backend address "http://example.com/foo/" does not match scheme://host format
-backend address "/foo" does not match scheme://host format
-backend address "example.com/" does not match scheme://host format
-backend address "http://example.com?foo=bar" does not match scheme://host format
-backend address "example.com" does not match scheme://host format
diff --git a/dataclients/kubernetes/definitions/testdata/errorwrapdata/routegroups.json b/dataclients/kubernetes/definitions/testdata/errorwrapdata/routegroups.json
@@ -148,46 +148,6 @@
                         "type": "network",
                         "address": "http://example.com"
                     },
-                    {
-                        "name": "backend2",
-                        "type": "network",
-                        "address": "http://example.com/foo"
-                    },
-                    {
-                        "name": "backend3",
-                        "type": "network",
-                        "address": "http://example.com/foo/bar"
-                    },
-                    {
-                        "name": "backend4",
-                        "type": "network",
-                        "address": "http://example.com/foo/"
-                    },
-                    {
-                        "name": "backend5",
-                        "type": "network",
-                        "address": "/foo"   
-                    },
-                    {
-                        "name": "backend6",
-                        "type": "network",
-                        "address": "example.com/"
-                    },
-                    {
-                        "name": "backend7",
-                        "type": "network",
-                        "address": "http://user:[email protected]"
-                    },
-                    {
-                        "name": "backend8",
-                        "type": "network",
-                        "address": "http://example.com?foo=bar"
-                    },
-                    {
-                        "name": "backend9",
-                        "type": "network",
-                        "address": "example.com"
-                    },
                     {
                         "name": "shunt",
                         "type": "shunt"

diff --git a/...ients/kubernetes/definitions/testdata/validation/route-with-invalid-backend-with-path.log b/...ients/kubernetes/definitions/testdata/validation/route-with-invalid-backend-with-path.log
diff --git a/...ents/kubernetes/definitions/testdata/validation/route-with-invalid-backend-with-path.yaml b/...ents/kubernetes/definitions/testdata/validation/route-with-invalid-backend-with-path.yaml