yusheng-guo/kube-metrics-adapter
1
0
Fork 1
mirror of https://github.com/zalando-incubator/kube-metrics-adapter.git synced 2025-05-10 07:30:00 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

Add support for networking.k8s.io

Browse Source 
Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
This commit is contained in:
Mikkel Oscar Lyderik Larsen
2020-05-26 14:39:13 +02:00
parent cadf2dff3c
commit ef24244074
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/collector/skipper_collector.go
View File

@ -125,7 +125,7 @@ func getWeights(ingressAnnotations map[string]string, backendAnnotations []strin
// getCollector returns a collector for getting the metrics. // getCollector returns a collector for getting the metrics.
func (c *SkipperCollector) getCollector() (Collector, error) { 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 { if err != nil {
return nil, err return nil, err
} }

4
pkg/collector/skipper_collector_test.go
View File

@ -10,7 +10,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2beta2" autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/api/extensions/v1beta1" v1beta1 "k8s.io/api/networking/v1beta1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
@ -382,7 +382,7 @@ func makeIngress(client kubernetes.Interface, namespace, ingressName, backend st
Host: hostname, Host: hostname,
}) })
} }
_, err := client.ExtensionsV1beta1().Ingresses(namespace).Create(ingress) _, err := client.NetworkingV1beta1().Ingresses(namespace).Create(ingress)
return err return err
} }

8
pkg/provider/metric_store.go
View File

@ -69,9 +69,15 @@ func (s *MetricStore) insertCustomMetric(value custom_metrics.MetricValue) {
Resource: "pods", Resource: "pods",
} }
case "Ingress": 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{ groupResource = schema.GroupResource{
Resource: "ingresses", Resource: "ingresses",
Group: "extensions", Group: group,
} }
} }