From ef2424407487be6e4073cc0f3eb9eefda4d0c27a Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Tue, 26 May 2020 14:39:13 +0200 Subject: [PATCH] Add support for networking.k8s.io Signed-off-by: Mikkel Oscar Lyderik Larsen --- pkg/collector/skipper_collector.go | 2 +- pkg/collector/skipper_collector_test.go | 4 ++-- pkg/provider/metric_store.go | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/collector/skipper_collector.go b/pkg/collector/skipper_collector.go index 7397f538..3ec1bf09 100644 --- a/pkg/collector/skipper_collector.go +++ b/pkg/collector/skipper_collector.go @@ -125,7 +125,7 @@ func getWeights(ingressAnnotations map[string]string, backendAnnotations []strin // getCollector returns a collector for getting the metrics. func (c *SkipperCollector) getCollector() (Collector, error) { - ingress, err := c.client.ExtensionsV1beta1().Ingresses(c.objectReference.Namespace).Get(c.objectReference.Name, metav1.GetOptions{}) + ingress, err := c.client.NetworkingV1beta1().Ingresses(c.objectReference.Namespace).Get(c.objectReference.Name, metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/pkg/collector/skipper_collector_test.go b/pkg/collector/skipper_collector_test.go index 60972f76..5aacb72f 100644 --- a/pkg/collector/skipper_collector_test.go +++ b/pkg/collector/skipper_collector_test.go @@ -10,7 +10,7 @@ import ( appsv1 "k8s.io/api/apps/v1" autoscalingv2 "k8s.io/api/autoscaling/v2beta2" corev1 "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + v1beta1 "k8s.io/api/networking/v1beta1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -382,7 +382,7 @@ func makeIngress(client kubernetes.Interface, namespace, ingressName, backend st Host: hostname, }) } - _, err := client.ExtensionsV1beta1().Ingresses(namespace).Create(ingress) + _, err := client.NetworkingV1beta1().Ingresses(namespace).Create(ingress) return err } diff --git a/pkg/provider/metric_store.go b/pkg/provider/metric_store.go index 06648d8c..eb5eb5c0 100644 --- a/pkg/provider/metric_store.go +++ b/pkg/provider/metric_store.go @@ -69,9 +69,15 @@ func (s *MetricStore) insertCustomMetric(value custom_metrics.MetricValue) { Resource: "pods", } case "Ingress": + // group can be either `extentions` or `networking.k8s.io` + group := "extensions" + gv, err := schema.ParseGroupVersion(value.DescribedObject.APIVersion) + if err == nil { + group = gv.Group + } groupResource = schema.GroupResource{ Resource: "ingresses", - Group: "extensions", + Group: group, } }