Merge branch 'master' into fix5165

kumahq · Oct 19, 2022 · 1124e6f · 1124e6f
2 parents ccb8861 + 9d2034d
commit 1124e6f
Show file tree

Hide file tree

Showing 19 changed files with 930 additions and 251 deletions.
diff --git a/app/kuma-dp/pkg/dataplane/metrics/server.go b/app/kuma-dp/pkg/dataplane/metrics/server.go
@@ -39,6 +39,7 @@ func RemoveQueryParameters(_ url.Values) string {
 
 func AddPrometheusFormat(queryParameters url.Values) string {
 	queryParameters.Add("format", "prometheus")
+	queryParameters.Add("text_readouts", "")
 	return queryParameters.Encode()
 }
 

diff --git a/app/kuma-dp/pkg/dataplane/metrics/server_test.go b/app/kuma-dp/pkg/dataplane/metrics/server_test.go
@@ -25,14 +25,14 @@ var _ = Describe("Rewriting the metrics URL", func() {
 			address:       "1.2.3.4",
 			input:         "http://foo/bar",
 			adminPort:     99,
-			expected:      "http://1.2.3.4:99/stats?format=prometheus",
+			expected:      "http://1.2.3.4:99/stats?format=prometheus&text_readouts=",
 			queryModifier: AddPrometheusFormat,
 		}),
 		Entry("preserve query parameters", testCase{
 			address:       "1.2.3.4",
 			input:         "http://foo/bar?one=two&three=four&filter=test_.*&usedonly",
 			adminPort:     80,
-			expected:      "http://1.2.3.4:80/stats?filter=test_.%2A&format=prometheus&one=two&three=four&usedonly=",
+			expected:      "http://1.2.3.4:80/stats?filter=test_.%2A&format=prometheus&one=two&text_readouts=&three=four&usedonly=",
 			queryModifier: AddPrometheusFormat,
 		}),
 		Entry("remove query parameters", testCase{

diff --git a/app/kumactl/cmd/apply/apply_test.go b/app/kumactl/cmd/apply/apply_test.go
@@ -508,7 +508,7 @@ spec:
       default:
         action: foo
 `,
-			err: `YAML contains invalid resource: from.0.default.action: from.0.default.action must be one of the following: "ALLOW", "DENY", "ALLOW_WITH_SHADOW_DENY", "DENY_WITH_SHADOW_ALLOW"`,
+			err: `YAML contains invalid resource: spec: from[0].default.action in body should be one of [ALLOW DENY ALLOW_WITH_SHADOW_DENY DENY_WITH_SHADOW_ALLOW]`,
 		}),
 	)
 })