Merge pull request #171 from dgrisonnet/disable-pnf

k8s-ci-robot · web-flow · commit 1a855fe8c789 · 2024-04-25T10:39:32.000-07:00
Disable priority and fairness by default
diff --git a/pkg/cmd/options/options.go b/pkg/cmd/options/options.go
@@ -58,6 +58,10 @@ func NewCustomMetricsAdapterServerOptions() *CustomMetricsAdapterServerOptions {
 		EnableMetrics: true,
 	}
 
+	// Explicitly disable Priority and Fairness since metric servers are not
+	// meant to be queried directly by default.
+	o.Features.EnablePriorityAndFairness = false
+
 	return o
 }
 
diff --git a/test-adapter-deploy/testing-adapter.yaml b/test-adapter-deploy/testing-adapter.yaml
@@ -176,14 +176,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - flowcontrol.apiserver.k8s.io
-  resources:
-  - prioritylevelconfigurations
-  - flowschemas
-  verbs:
-  - list
-  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ func NewCustomMetricsAdapterServerOptions() *CustomMetricsAdapterServerOptions {`
`58`	`58`	`EnableMetrics: true,`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ // Explicitly disable Priority and Fairness since metric servers are not`
	`62`	`+ // meant to be queried directly by default.`
	`63`	`+ o.Features.EnablePriorityAndFairness = false`
	`64`	`+`
`61`	`65`	`return o`
`62`	`66`	`}`
`63`	`67`