Address comments

kubernetes · Feb 5, 2019 · c917158 · c917158
1 parent 88a6f21
commit c917158
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/internal/collector/csr.go b/internal/collector/csr.go
@@ -122,6 +122,10 @@ func addCSRConditionMetrics(cs certv1beta1.CertificateSigningRequestStatus) []*m
 			}
 		}
 	}
+	//"approved" if a certificate request has the
+	// "Approved" condition and no "Denied" conditions; false otherwise.
+	approved = approved && !denied
+
 	return []*metric.Metric{
 		&metric.Metric{
 			LabelValues: []string{"issued"},
@@ -130,7 +134,7 @@ func addCSRConditionMetrics(cs certv1beta1.CertificateSigningRequestStatus) []*m
 		},
 		&metric.Metric{
 			LabelValues: []string{"pending"},
-			Value:       boolFloat64(len(cs.Certificate) == 0),
+			Value:       boolFloat64(!(approved || denied)),
 			LabelKeys:   []string{"csr_condition"},
 		},
 		&metric.Metric{

diff --git a/internal/collector/csr_test.go b/internal/collector/csr_test.go
@@ -81,7 +81,7 @@ func TestCsrCollector(t *testing.T) {
 			Want: `
 				kube_csr_created{csr="certificate-test"} 1.5e+09
 				kube_csr_condition{csr="certificate-test",csr_condition="issued"} 0
-				kube_csr_condition{csr="certificate-test",csr_condition="pending"} 1
+				kube_csr_condition{csr="certificate-test",csr_condition="pending"} 0
 				kube_csr_condition{csr="certificate-test",csr_condition="approved"} 0
 				kube_csr_condition{csr="certificate-test",csr_condition="denied"} 1
 				kube_csr_labels{csr="certificate-test",label_cert="test"} 1
@@ -110,7 +110,7 @@ func TestCsrCollector(t *testing.T) {
 			Want: `
 				kube_csr_created{csr="certificate-test"} 1.5e+09
 				kube_csr_condition{csr="certificate-test",csr_condition="issued"} 0
-				kube_csr_condition{csr="certificate-test",csr_condition="pending"} 1
+				kube_csr_condition{csr="certificate-test",csr_condition="pending"} 0
 				kube_csr_condition{csr="certificate-test",csr_condition="approved"} 1
 				kube_csr_condition{csr="certificate-test",csr_condition="denied"} 0
 				kube_csr_labels{csr="certificate-test",label_cert="test"} 1
@@ -143,6 +143,37 @@ func TestCsrCollector(t *testing.T) {
 				kube_csr_condition{csr="certificate-test",csr_condition="approved"} 1
 				kube_csr_condition{csr="certificate-test",csr_condition="denied"} 0
 				kube_csr_labels{csr="certificate-test",label_cert="test"} 1
+`,
+			MetricNames: []string{"kube_csr_created", "kube_csr_condition", "kube_csr_labels"},
+		},
+		{
+			Obj: &certv1beta1.CertificateSigningRequest{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:       "certificate-test",
+					Generation: 1,
+					Labels: map[string]string{
+						"cert": "test",
+					},
+					CreationTimestamp: metav1.Time{Time: time.Unix(1500000000, 0)},
+				},
+				Status: certv1beta1.CertificateSigningRequestStatus{
+					Conditions: []certv1beta1.CertificateSigningRequestCondition{
+						{
+							Type: certv1beta1.CertificateApproved,
+						},
+						{
+							Type: certv1beta1.CertificateDenied,
+						},
+					},
+				},
+			},
+			Want: `
+				kube_csr_created{csr="certificate-test"} 1.5e+09
+				kube_csr_condition{csr="certificate-test",csr_condition="issued"} 0
+				kube_csr_condition{csr="certificate-test",csr_condition="pending"} 0
+				kube_csr_condition{csr="certificate-test",csr_condition="approved"} 0
+				kube_csr_condition{csr="certificate-test",csr_condition="denied"} 1
+				kube_csr_labels{csr="certificate-test",label_cert="test"} 1
 `,
 			MetricNames: []string{"kube_csr_created", "kube_csr_condition", "kube_csr_labels"},
 		},