2016-10-13 06:36:15 -07:00
|
|
|
// Copyright 2016 The Prometheus Authors
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package kubernetes
|
|
|
|
|
|
|
|
import (
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/prometheus/common/model"
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
"github.com/prometheus/prometheus/discovery/targetgroup"
|
2017-05-11 01:29:10 -07:00
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
2017-11-24 04:24:13 -08:00
|
|
|
"k8s.io/apimachinery/pkg/types"
|
2017-05-11 01:29:10 -07:00
|
|
|
"k8s.io/client-go/pkg/api/v1"
|
|
|
|
"k8s.io/client-go/tools/cache"
|
2016-10-13 06:36:15 -07:00
|
|
|
)
|
|
|
|
|
|
|
|
func podStoreKeyFunc(obj interface{}) (string, error) {
|
|
|
|
return obj.(*v1.Pod).ObjectMeta.Name, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func newFakePodInformer() *fakeInformer {
|
|
|
|
return newFakeInformer(podStoreKeyFunc)
|
|
|
|
}
|
|
|
|
|
|
|
|
func makeTestPodDiscovery() (*Pod, *fakeInformer) {
|
|
|
|
i := newFakePodInformer()
|
2017-08-11 11:45:52 -07:00
|
|
|
return NewPod(nil, i), i
|
2016-10-13 06:36:15 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
func makeMultiPortPod() *v1.Pod {
|
|
|
|
return &v1.Pod{
|
2017-05-11 01:29:10 -07:00
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testpod",
|
|
|
|
Namespace: "default",
|
|
|
|
Labels: map[string]string{"testlabel": "testvalue"},
|
|
|
|
Annotations: map[string]string{"testannotation": "testannotationvalue"},
|
2017-11-24 04:24:13 -08:00
|
|
|
UID: types.UID("abc123"),
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Spec: v1.PodSpec{
|
|
|
|
NodeName: "testnode",
|
|
|
|
Containers: []v1.Container{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testcontainer0",
|
|
|
|
Ports: []v1.ContainerPort{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testport0",
|
|
|
|
Protocol: v1.ProtocolTCP,
|
|
|
|
ContainerPort: int32(9000),
|
|
|
|
},
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testport1",
|
|
|
|
Protocol: v1.ProtocolUDP,
|
|
|
|
ContainerPort: int32(9001),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testcontainer1",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Status: v1.PodStatus{
|
|
|
|
PodIP: "1.2.3.4",
|
|
|
|
HostIP: "2.3.4.5",
|
|
|
|
Conditions: []v1.PodCondition{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Type: v1.PodReady,
|
|
|
|
Status: v1.ConditionTrue,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func makePod() *v1.Pod {
|
|
|
|
return &v1.Pod{
|
2017-05-11 01:29:10 -07:00
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testpod",
|
|
|
|
Namespace: "default",
|
2017-11-24 04:24:13 -08:00
|
|
|
UID: types.UID("abc123"),
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Spec: v1.PodSpec{
|
|
|
|
NodeName: "testnode",
|
|
|
|
Containers: []v1.Container{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testcontainer",
|
|
|
|
Ports: []v1.ContainerPort{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testport",
|
|
|
|
Protocol: v1.ProtocolTCP,
|
|
|
|
ContainerPort: int32(9000),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Status: v1.PodStatus{
|
|
|
|
PodIP: "1.2.3.4",
|
|
|
|
HostIP: "2.3.4.5",
|
|
|
|
Conditions: []v1.PodCondition{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Type: v1.PodReady,
|
|
|
|
Status: v1.ConditionTrue,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPodDiscoveryInitial(t *testing.T) {
|
|
|
|
n, i := makeTestPodDiscovery()
|
|
|
|
i.GetStore().Add(makeMultiPortPod())
|
|
|
|
|
|
|
|
k8sDiscoveryTest{
|
|
|
|
discovery: n,
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedInitial: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Targets: []model.LabelSet{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
"__address__": "1.2.3.4:9000",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer0",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport0",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9000",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "TCP",
|
|
|
|
},
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
"__address__": "1.2.3.4:9001",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer0",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport1",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9001",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "UDP",
|
|
|
|
},
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
"__address__": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer1",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Labels: model.LabelSet{
|
|
|
|
"__meta_kubernetes_pod_name": "testpod",
|
|
|
|
"__meta_kubernetes_namespace": "default",
|
|
|
|
"__meta_kubernetes_pod_label_testlabel": "testvalue",
|
|
|
|
"__meta_kubernetes_pod_annotation_testannotation": "testannotationvalue",
|
|
|
|
"__meta_kubernetes_pod_node_name": "testnode",
|
|
|
|
"__meta_kubernetes_pod_ip": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_host_ip": "2.3.4.5",
|
|
|
|
"__meta_kubernetes_pod_ready": "true",
|
2017-11-24 04:24:13 -08:00
|
|
|
"__meta_kubernetes_pod_uid": "abc123",
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}.Run(t)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPodDiscoveryAdd(t *testing.T) {
|
|
|
|
n, i := makeTestPodDiscovery()
|
|
|
|
|
|
|
|
k8sDiscoveryTest{
|
|
|
|
discovery: n,
|
|
|
|
afterStart: func() { go func() { i.Add(makePod()) }() },
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedRes: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Targets: []model.LabelSet{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
"__address__": "1.2.3.4:9000",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9000",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "TCP",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Labels: model.LabelSet{
|
|
|
|
"__meta_kubernetes_pod_name": "testpod",
|
|
|
|
"__meta_kubernetes_namespace": "default",
|
|
|
|
"__meta_kubernetes_pod_node_name": "testnode",
|
|
|
|
"__meta_kubernetes_pod_ip": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_host_ip": "2.3.4.5",
|
|
|
|
"__meta_kubernetes_pod_ready": "true",
|
2017-11-24 04:24:13 -08:00
|
|
|
"__meta_kubernetes_pod_uid": "abc123",
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}.Run(t)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPodDiscoveryDelete(t *testing.T) {
|
|
|
|
n, i := makeTestPodDiscovery()
|
|
|
|
i.GetStore().Add(makePod())
|
|
|
|
|
|
|
|
k8sDiscoveryTest{
|
|
|
|
discovery: n,
|
|
|
|
afterStart: func() { go func() { i.Delete(makePod()) }() },
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedInitial: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-11-14 07:21:38 -08:00
|
|
|
Targets: []model.LabelSet{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-11-14 07:21:38 -08:00
|
|
|
"__address__": "1.2.3.4:9000",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9000",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "TCP",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Labels: model.LabelSet{
|
|
|
|
"__meta_kubernetes_pod_name": "testpod",
|
|
|
|
"__meta_kubernetes_namespace": "default",
|
|
|
|
"__meta_kubernetes_pod_node_name": "testnode",
|
|
|
|
"__meta_kubernetes_pod_ip": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_host_ip": "2.3.4.5",
|
|
|
|
"__meta_kubernetes_pod_ready": "true",
|
2017-11-24 04:24:13 -08:00
|
|
|
"__meta_kubernetes_pod_uid": "abc123",
|
2016-11-14 07:21:38 -08:00
|
|
|
},
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedRes: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-11-14 07:21:38 -08:00
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}.Run(t)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPodDiscoveryDeleteUnknownCacheState(t *testing.T) {
|
|
|
|
n, i := makeTestPodDiscovery()
|
|
|
|
i.GetStore().Add(makePod())
|
|
|
|
|
|
|
|
k8sDiscoveryTest{
|
|
|
|
discovery: n,
|
|
|
|
afterStart: func() { go func() { i.Delete(cache.DeletedFinalStateUnknown{Obj: makePod()}) }() },
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedInitial: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Targets: []model.LabelSet{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
"__address__": "1.2.3.4:9000",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9000",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "TCP",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Labels: model.LabelSet{
|
|
|
|
"__meta_kubernetes_pod_name": "testpod",
|
|
|
|
"__meta_kubernetes_namespace": "default",
|
|
|
|
"__meta_kubernetes_pod_node_name": "testnode",
|
|
|
|
"__meta_kubernetes_pod_ip": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_host_ip": "2.3.4.5",
|
|
|
|
"__meta_kubernetes_pod_ready": "true",
|
2017-11-24 04:24:13 -08:00
|
|
|
"__meta_kubernetes_pod_uid": "abc123",
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedRes: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}.Run(t)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPodDiscoveryUpdate(t *testing.T) {
|
|
|
|
n, i := makeTestPodDiscovery()
|
|
|
|
i.GetStore().Add(&v1.Pod{
|
2017-05-11 01:29:10 -07:00
|
|
|
ObjectMeta: metav1.ObjectMeta{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testpod",
|
|
|
|
Namespace: "default",
|
2017-11-24 07:02:42 -08:00
|
|
|
UID: "xyz321",
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Spec: v1.PodSpec{
|
|
|
|
NodeName: "testnode",
|
|
|
|
Containers: []v1.Container{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testcontainer",
|
|
|
|
Ports: []v1.ContainerPort{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Name: "testport",
|
|
|
|
Protocol: v1.ProtocolTCP,
|
|
|
|
ContainerPort: int32(9000),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Status: v1.PodStatus{
|
|
|
|
PodIP: "1.2.3.4",
|
|
|
|
HostIP: "2.3.4.5",
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
k8sDiscoveryTest{
|
|
|
|
discovery: n,
|
|
|
|
afterStart: func() { go func() { i.Update(makePod()) }() },
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedInitial: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Targets: []model.LabelSet{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
"__address__": "1.2.3.4:9000",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9000",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "TCP",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Labels: model.LabelSet{
|
|
|
|
"__meta_kubernetes_pod_name": "testpod",
|
|
|
|
"__meta_kubernetes_namespace": "default",
|
|
|
|
"__meta_kubernetes_pod_node_name": "testnode",
|
|
|
|
"__meta_kubernetes_pod_ip": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_host_ip": "2.3.4.5",
|
|
|
|
"__meta_kubernetes_pod_ready": "unknown",
|
2017-11-24 07:02:42 -08:00
|
|
|
"__meta_kubernetes_pod_uid": "xyz321",
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
Refactor SD configuration to remove `config` dependency (#3629)
* refactor: move targetGroup struct and CheckOverflow() to their own package
* refactor: move auth and security related structs to a utility package, fix import error in utility package
* refactor: Azure SD, remove SD struct from config
* refactor: DNS SD, remove SD struct from config into dns package
* refactor: ec2 SD, move SD struct from config into the ec2 package
* refactor: file SD, move SD struct from config to file discovery package
* refactor: gce, move SD struct from config to gce discovery package
* refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil
* refactor: consul, move SD struct from config into consul discovery package
* refactor: marathon, move SD struct from config into marathon discovery package
* refactor: triton, move SD struct from config to triton discovery package, fix test
* refactor: zookeeper, move SD structs from config to zookeeper discovery package
* refactor: openstack, remove SD struct from config, move into openstack discovery package
* refactor: kubernetes, move SD struct from config into kubernetes discovery package
* refactor: notifier, use targetgroup package instead of config
* refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup
* refactor: retrieval, use targetgroup package instead of config.TargetGroup
* refactor: storage, use config util package
* refactor: discovery manager, use targetgroup package instead of config.TargetGroup
* refactor: use HTTPClient and TLS config from configUtil instead of config
* refactor: tests, use targetgroup package instead of config.TargetGroup
* refactor: fix tagetgroup.Group pointers that were removed by mistake
* refactor: openstack, kubernetes: drop prefixes
* refactor: remove import aliases forced due to vscode bug
* refactor: move main SD struct out of config into discovery/config
* refactor: rename configUtil to config_util
* refactor: rename yamlUtil to yaml_config
* refactor: kubernetes, remove prefixes
* refactor: move the TargetGroup package to discovery/
* refactor: fix order of imports
2017-12-29 12:01:34 -08:00
|
|
|
expectedRes: []*targetgroup.Group{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
Targets: []model.LabelSet{
|
2017-03-16 16:29:47 -07:00
|
|
|
{
|
2016-10-13 06:36:15 -07:00
|
|
|
"__address__": "1.2.3.4:9000",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9000",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "TCP",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Labels: model.LabelSet{
|
|
|
|
"__meta_kubernetes_pod_name": "testpod",
|
|
|
|
"__meta_kubernetes_namespace": "default",
|
|
|
|
"__meta_kubernetes_pod_node_name": "testnode",
|
|
|
|
"__meta_kubernetes_pod_ip": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_host_ip": "2.3.4.5",
|
|
|
|
"__meta_kubernetes_pod_ready": "true",
|
2017-11-24 04:24:13 -08:00
|
|
|
"__meta_kubernetes_pod_uid": "abc123",
|
2016-10-13 06:36:15 -07:00
|
|
|
},
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}.Run(t)
|
|
|
|
}
|
2018-02-14 05:23:52 -08:00
|
|
|
|
|
|
|
func TestPodDiscoveryUpdateEmptyPodIP(t *testing.T) {
|
|
|
|
n, i := makeTestPodDiscovery()
|
|
|
|
initialPod := makePod()
|
|
|
|
|
|
|
|
updatedPod := makePod()
|
|
|
|
updatedPod.Status.PodIP = ""
|
|
|
|
|
|
|
|
i.GetStore().Add(initialPod)
|
|
|
|
|
|
|
|
k8sDiscoveryTest{
|
|
|
|
discovery: n,
|
|
|
|
afterStart: func() { go func() { i.Update(updatedPod) }() },
|
|
|
|
expectedInitial: []*targetgroup.Group{
|
|
|
|
{
|
|
|
|
Targets: []model.LabelSet{
|
|
|
|
{
|
|
|
|
"__address__": "1.2.3.4:9000",
|
|
|
|
"__meta_kubernetes_pod_container_name": "testcontainer",
|
|
|
|
"__meta_kubernetes_pod_container_port_name": "testport",
|
|
|
|
"__meta_kubernetes_pod_container_port_number": "9000",
|
|
|
|
"__meta_kubernetes_pod_container_port_protocol": "TCP",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Labels: model.LabelSet{
|
|
|
|
"__meta_kubernetes_pod_name": "testpod",
|
|
|
|
"__meta_kubernetes_namespace": "default",
|
|
|
|
"__meta_kubernetes_pod_node_name": "testnode",
|
|
|
|
"__meta_kubernetes_pod_ip": "1.2.3.4",
|
|
|
|
"__meta_kubernetes_pod_host_ip": "2.3.4.5",
|
|
|
|
"__meta_kubernetes_pod_ready": "true",
|
|
|
|
"__meta_kubernetes_pod_uid": "abc123",
|
|
|
|
},
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
expectedRes: []*targetgroup.Group{
|
|
|
|
{
|
|
|
|
Source: "pod/default/testpod",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}.Run(t)
|
|
|
|
}
|