Skip to content

Commit

Permalink
Merge pull request #804 from qw1mb0/replicaset-appsv1
Browse files Browse the repository at this point in the history 
use appsv1 apigroup for ReplicaSet
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Jun 26, 2019
2 parents f24d831 + 536aef3 commit c55a5c3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
30 changes: 15 additions & 15 deletions internal/store/replicaset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"k8s.io/kube-state-metrics/pkg/metric"

"k8s.io/api/extensions/v1beta1"
v1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
Expand All @@ -39,7 +39,7 @@ var (
Name: "kube_replicaset_created",
Type: metric.Gauge,
Help: "Unix creation timestamp",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
ms := []*metric.Metric{}

if !r.CreationTimestamp.IsZero() {
Expand All @@ -58,7 +58,7 @@ var (
Name: "kube_replicaset_status_replicas",
Type: metric.Gauge,
Help: "The number of replicas per ReplicaSet.",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
return &metric.Family{
Metrics: []*metric.Metric{
{
Expand All @@ -72,7 +72,7 @@ var (
Name: "kube_replicaset_status_fully_labeled_replicas",
Type: metric.Gauge,
Help: "The number of fully labeled replicas per ReplicaSet.",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
return &metric.Family{
Metrics: []*metric.Metric{
{
Expand All @@ -86,7 +86,7 @@ var (
Name: "kube_replicaset_status_ready_replicas",
Type: metric.Gauge,
Help: "The number of ready replicas per ReplicaSet.",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
return &metric.Family{
Metrics: []*metric.Metric{
{
Expand All @@ -100,7 +100,7 @@ var (
Name: "kube_replicaset_status_observed_generation",
Type: metric.Gauge,
Help: "The generation observed by the ReplicaSet controller.",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
return &metric.Family{
Metrics: []*metric.Metric{
{
Expand All @@ -114,7 +114,7 @@ var (
Name: "kube_replicaset_spec_replicas",
Type: metric.Gauge,
Help: "Number of desired pods for a ReplicaSet.",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
ms := []*metric.Metric{}

if r.Spec.Replicas != nil {
Expand All @@ -132,7 +132,7 @@ var (
Name: "kube_replicaset_metadata_generation",
Type: metric.Gauge,
Help: "Sequence number representing a specific generation of the desired state.",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
return &metric.Family{
Metrics: []*metric.Metric{
{
Expand All @@ -146,7 +146,7 @@ var (
Name: "kube_replicaset_owner",
Type: metric.Gauge,
Help: "Information about the ReplicaSet's owner.",
GenerateFunc: wrapReplicaSetFunc(func(r *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(r *v1.ReplicaSet) *metric.Family {
owners := r.GetOwnerReferences()

if len(owners) == 0 {
Expand Down Expand Up @@ -189,7 +189,7 @@ var (
Name: descReplicaSetLabelsName,
Type: metric.Gauge,
Help: descReplicaSetLabelsHelp,
GenerateFunc: wrapReplicaSetFunc(func(d *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(d *v1.ReplicaSet) *metric.Family {
labelKeys, labelValues := kubeLabelsToPrometheusLabels(d.Labels)
return &metric.Family{
Metrics: []*metric.Metric{
Expand All @@ -206,7 +206,7 @@ var (
Name: "kube_replicaset_annotations",
Type: metric.Gauge,
Help: "Kubernetes annotations converted to Prometheus labels.",
GenerateFunc: wrapReplicaSetFunc(func(d *v1beta1.ReplicaSet) *metric.Family {
GenerateFunc: wrapReplicaSetFunc(func(d *v1.ReplicaSet) *metric.Family {
annotationKeys, annotationValues := kubeAnnotationsToPrometheusAnnotations(d.Annotations)
return &metric.Family{
Metrics: []*metric.Metric{
Expand All @@ -222,9 +222,9 @@ var (
}
)

func wrapReplicaSetFunc(f func(*v1beta1.ReplicaSet) *metric.Family) func(interface{}) *metric.Family {
func wrapReplicaSetFunc(f func(*v1.ReplicaSet) *metric.Family) func(interface{}) *metric.Family {
return func(obj interface{}) *metric.Family {
replicaSet := obj.(*v1beta1.ReplicaSet)
replicaSet := obj.(*v1.ReplicaSet)

metricFamily := f(replicaSet)

Expand All @@ -240,10 +240,10 @@ func wrapReplicaSetFunc(f func(*v1beta1.ReplicaSet) *metric.Family) func(interfa
func createReplicaSetListWatch(kubeClient clientset.Interface, ns string) cache.ListerWatcher {
return &cache.ListWatch{
ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
return kubeClient.ExtensionsV1beta1().ReplicaSets(ns).List(opts)
return kubeClient.AppsV1().ReplicaSets(ns).List(opts)
},
WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
return kubeClient.ExtensionsV1beta1().ReplicaSets(ns).Watch(opts)
return kubeClient.AppsV1().ReplicaSets(ns).Watch(opts)
},
}
}
14 changes: 7 additions & 7 deletions internal/store/replicaset_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"
"time"

"k8s.io/api/extensions/v1beta1"
v1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kube-state-metrics/pkg/metric"
)
Expand Down Expand Up @@ -59,7 +59,7 @@ func TestReplicaSetStore(t *testing.T) {
`
cases := []generateMetricsTestCase{
{
Obj: &v1beta1.ReplicaSet{
Obj: &v1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{
Name: "rs1",
CreationTimestamp: metav1.Time{Time: time.Unix(1500000000, 0)},
Expand All @@ -79,13 +79,13 @@ func TestReplicaSetStore(t *testing.T) {
"app": "example1",
},
},
Status: v1beta1.ReplicaSetStatus{
Status: v1.ReplicaSetStatus{
Replicas: 5,
FullyLabeledReplicas: 10,
ReadyReplicas: 5,
ObservedGeneration: 1,
},
Spec: v1beta1.ReplicaSetSpec{
Spec: v1.ReplicaSetSpec{
Replicas: &rs1Replicas,
},
},
Expand All @@ -103,7 +103,7 @@ func TestReplicaSetStore(t *testing.T) {
`,
},
{
Obj: &v1beta1.ReplicaSet{
Obj: &v1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{
Name: "rs2",
Namespace: "ns2",
Expand All @@ -117,13 +117,13 @@ func TestReplicaSetStore(t *testing.T) {
"env": "ex",
},
},
Status: v1beta1.ReplicaSetStatus{
Status: v1.ReplicaSetStatus{
Replicas: 0,
FullyLabeledReplicas: 5,
ReadyReplicas: 0,
ObservedGeneration: 5,
},
Spec: v1beta1.ReplicaSetSpec{
Spec: v1.ReplicaSetSpec{
Replicas: &rs2Replicas,
},
},
Expand Down

0 comments on commit c55a5c3

Please sign in to comment.