Migrate ingress and certificates away from deprecated APIs

examples/autosharding/cluster-role-binding.yaml

@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha
+    app.kubernetes.io/version: 2.0.0-alpha.1
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

examples/autosharding/cluster-role.yaml

@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha
+    app.kubernetes.io/version: 2.0.0-alpha.1
   name: kube-state-metrics
 rules:
 - apiGroups:
@@ -30,7 +30,6 @@ rules:
   - daemonsets
   - deployments
   - replicasets
-  - ingresses
   verbs:
   - list
   - watch
@@ -105,6 +104,7 @@ rules:
   - networking.k8s.io
   resources:
   - networkpolicies
+  - ingresses
   verbs:
   - list
   - watch

examples/autosharding/role-binding.yaml

@@ -3,8 +3,9 @@ kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha
+    app.kubernetes.io/version: 2.0.0-alpha.1
   name: kube-state-metrics
+  namespace: kube-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

examples/autosharding/role.yaml

@@ -3,7 +3,7 @@ kind: Role
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha
+    app.kubernetes.io/version: 2.0.0-alpha.1
   name: kube-state-metrics
   namespace: kube-system
 rules:

examples/autosharding/service-account.yaml

@@ -3,6 +3,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha
+    app.kubernetes.io/version: 2.0.0-alpha.1
   name: kube-state-metrics
   namespace: kube-system

examples/autosharding/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha
+    app.kubernetes.io/version: 2.0.0-alpha.1
   name: kube-state-metrics
   namespace: kube-system
 spec:

examples/autosharding/statefulset.yaml

@@ -3,7 +3,7 @@ kind: StatefulSet
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha
+    app.kubernetes.io/version: 2.0.0-alpha.1
   name: kube-state-metrics
   namespace: kube-system
 spec:
@@ -16,7 +16,7 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: kube-state-metrics
-        app.kubernetes.io/version: 2.0.0-alpha
+        app.kubernetes.io/version: 2.0.0-alpha.1
     spec:
       containers:
       - args:
@@ -33,7 +33,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/coreos/kube-state-metrics:v2.0.0-alpha
+        image: quay.io/coreos/kube-state-metrics:v2.0.0-alpha.1
         livenessProbe:
           httpGet:
             path: /healthz

examples/standard/cluster-role.yaml

@@ -30,7 +30,6 @@ rules:
   - daemonsets
   - deployments
   - replicasets
-  - ingresses
   verbs:
   - list
   - watch
@@ -105,6 +104,7 @@ rules:
   - networking.k8s.io
   resources:
   - networkpolicies
+  - ingresses
   verbs:
   - list
   - watch

internal/store/builder.go

@@ -29,10 +29,9 @@ import (
 	autoscaling "k8s.io/api/autoscaling/v2beta1"
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
-	certv1beta1 "k8s.io/api/certificates/v1beta1"
+	certv1 "k8s.io/api/certificates/v1"
 	coordinationv1 "k8s.io/api/coordination/v1"
 	v1 "k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
 	networkingv1 "k8s.io/api/networking/v1"
 	policy "k8s.io/api/policy/v1beta1"
 	storagev1 "k8s.io/api/storage/v1"
@@ -235,7 +234,7 @@ func (b *Builder) buildHPAStore() cache.Store {
 }
 
 func (b *Builder) buildIngressStore() cache.Store {
-	return b.buildStoreFunc(ingressMetricFamilies, &extensions.Ingress{}, createIngressListWatch)
+	return b.buildStoreFunc(ingressMetricFamilies, &networkingv1.Ingress{}, createIngressListWatch)
 }
 
 func (b *Builder) buildJobStore() cache.Store {
@@ -307,7 +306,7 @@ func (b *Builder) buildPodStore() cache.Store {
 }
 
 func (b *Builder) buildCsrStore() cache.Store {
-	return b.buildStoreFunc(csrMetricFamilies, &certv1beta1.CertificateSigningRequest{}, createCSRListWatch)
+	return b.buildStoreFunc(csrMetricFamilies, &certv1.CertificateSigningRequest{}, createCSRListWatch)
 }
 
 func (b *Builder) buildValidatingWebhookConfigurationStore() cache.Store {

internal/store/certificatesigningrequest.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/kube-state-metrics/v2/pkg/metric"
 	generator "k8s.io/kube-state-metrics/v2/pkg/metric_generator"
 
-	certv1beta1 "k8s.io/api/certificates/v1beta1"
+	certv1 "k8s.io/api/certificates/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
@@ -41,7 +41,7 @@ var (
 			descCSRLabelsHelp,
 			metric.Gauge,
 			"",
-			wrapCSRFunc(func(j *certv1beta1.CertificateSigningRequest) *metric.Family {
+			wrapCSRFunc(func(j *certv1.CertificateSigningRequest) *metric.Family {
 				labelKeys, labelValues := kubeLabelsToPrometheusLabels(j.Labels)
 				return &metric.Family{
 					Metrics: []*metric.Metric{
@@ -59,7 +59,7 @@ var (
 			"Unix creation timestamp",
 			metric.Gauge,
 			"",
-			wrapCSRFunc(func(csr *certv1beta1.CertificateSigningRequest) *metric.Family {
+			wrapCSRFunc(func(csr *certv1.CertificateSigningRequest) *metric.Family {
 				ms := []*metric.Metric{}
 				if !csr.CreationTimestamp.IsZero() {
 					ms = append(ms, &metric.Metric{
@@ -79,7 +79,7 @@ var (
 			"The number of each certificatesigningrequest condition",
 			metric.Gauge,
 			"",
-			wrapCSRFunc(func(csr *certv1beta1.CertificateSigningRequest) *metric.Family {
+			wrapCSRFunc(func(csr *certv1.CertificateSigningRequest) *metric.Family {
 				return &metric.Family{
 					Metrics: addCSRConditionMetrics(csr.Status),
 				}
@@ -90,7 +90,7 @@ var (
 			"Length of the issued cert",
 			metric.Gauge,
 			"",
-			wrapCSRFunc(func(csr *certv1beta1.CertificateSigningRequest) *metric.Family {
+			wrapCSRFunc(func(csr *certv1.CertificateSigningRequest) *metric.Family {
 				return &metric.Family{
 					Metrics: []*metric.Metric{
 						{
@@ -105,10 +105,9 @@ var (
 	}
 )
 
-func wrapCSRFunc(f func(*certv1beta1.CertificateSigningRequest) *metric.Family) func(interface{}) *metric.Family {
+func wrapCSRFunc(f func(*certv1.CertificateSigningRequest) *metric.Family) func(interface{}) *metric.Family {
 	return func(obj interface{}) *metric.Family {
-		csr := obj.(*certv1beta1.CertificateSigningRequest)
-
+		csr := obj.(*certv1.CertificateSigningRequest)
 		metricFamily := f(csr)
 
 		for _, m := range metricFamily.Metrics {
@@ -123,23 +122,23 @@ func wrapCSRFunc(f func(*certv1beta1.CertificateSigningRequest) *metric.Family)
 func createCSRListWatch(kubeClient clientset.Interface, ns string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return kubeClient.CertificatesV1beta1().CertificateSigningRequests().List(context.TODO(), opts)
+			return kubeClient.CertificatesV1().CertificateSigningRequests().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return kubeClient.CertificatesV1beta1().CertificateSigningRequests().Watch(context.TODO(), opts)
+			return kubeClient.CertificatesV1().CertificateSigningRequests().Watch(context.TODO(), opts)
 		},
 	}
 }
 
 // addCSRConditionMetrics generates one metric for each possible csr condition status
-func addCSRConditionMetrics(cs certv1beta1.CertificateSigningRequestStatus) []*metric.Metric {
+func addCSRConditionMetrics(cs certv1.CertificateSigningRequestStatus) []*metric.Metric {
 	cApproved := 0
 	cDenied := 0
 	for _, s := range cs.Conditions {
-		if s.Type == certv1beta1.CertificateApproved {
+		if s.Type == certv1.CertificateApproved {
 			cApproved++
 		}
-		if s.Type == certv1beta1.CertificateDenied {
+		if s.Type == certv1.CertificateDenied {
 			cDenied++
 		}
 	}