Skip to content

K
k3s
Unverified Commit f9cf0072 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #57165 from tallclair/admit-metrics

Automatic merge from submit-queue (batch tested with PRs 56375, 56872, 57053, 57165, 57218). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix admission metrics tests Cleanup some typos in the admission metrics tests. ```release-note NONE ```
parents adc648da cca35ae1
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go
View file @ f9cf0072
...@@ -65,7 +65,7 @@ func TestObserveAdmissionController(t *testing.T) { ...@@ -65,7 +65,7 @@ func TestObserveAdmissionController(t *testing.T) {
"version": resource.Version, "version": resource.Version,
"resource": resource.Resource, "resource": resource.Resource,
"subresource": "subresource", "subresource": "subresource",
"type": "validate", "type": "admit",
"rejected": "false", "rejected": "false",
} }
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", wantLabels, 1) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", wantLabels, 1)
...@@ -133,7 +133,7 @@ func TestWithMetrics(t *testing.T) { ...@@ -133,7 +133,7 @@ func TestWithMetrics(t *testing.T) {
"validate-interfaces-dont-validate", "validate-interfaces-dont-validate",
"some-ns", "some-ns",
admission.Create, admission.Create,
&validatingFakeHandler{admission.NewHandler(admission.Create, admission.Update), true}, &validatingFakeHandler{admission.NewHandler(admission.Create, admission.Update), false},
true, false, true, false,
}, },
{ {
...@@ -148,7 +148,7 @@ func TestWithMetrics(t *testing.T) { ...@@ -148,7 +148,7 @@ func TestWithMetrics(t *testing.T) {
"some-ns", "some-ns",
admission.Create, admission.Create,
&mutatingFakeHandler{admission.NewHandler(admission.Create, admission.Update), false}, &mutatingFakeHandler{admission.NewHandler(admission.Create, admission.Update), false},
true, false, false, true,
}, },
} { } {
Metrics.reset() Metrics.reset()
...@@ -165,7 +165,7 @@ func TestWithMetrics(t *testing.T) { ...@@ -165,7 +165,7 @@ func TestWithMetrics(t *testing.T) {
continue continue
} }
filter := map[string]string{"rejected": "false"} filter := map[string]string{"type": "admit", "rejected": "false"}
if !test.admit { if !test.admit {
filter["rejected"] = "true" filter["rejected"] = "true"
} }
...@@ -175,7 +175,7 @@ func TestWithMetrics(t *testing.T) { ...@@ -175,7 +175,7 @@ func TestWithMetrics(t *testing.T) {
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 0) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 0)
} }
if err == nil { if err != nil {
// skip validation step if mutation failed // skip validation step if mutation failed
continue continue
} }
...@@ -190,8 +190,8 @@ func TestWithMetrics(t *testing.T) { ...@@ -190,8 +190,8 @@ func TestWithMetrics(t *testing.T) {
continue continue
} }
filter = map[string]string{"rejected": "false"} filter = map[string]string{"type": "validate", "rejected": "false"}
if !test.admit { if !test.validate {
filter["rejected"] = "true" filter["rejected"] = "true"
} }
if _, validating := test.handler.(admission.ValidationInterface); validating { if _, validating := test.handler.(admission.ValidationInterface); validating {
...@@ -239,7 +239,7 @@ type mutatingFakeHandler struct { ...@@ -239,7 +239,7 @@ type mutatingFakeHandler struct {
admit bool admit bool
} }
func (h *mutatingFakeHandler) Amit(a admission.Attributes) (err error) { func (h *mutatingFakeHandler) Admit(a admission.Attributes) (err error) {
if h.admit { if h.admit {
return nil return nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment