mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-09 02:24:16 +00:00
Code Activity

feat: add nodeName to kubelet endpoints (#7019)

Browse source 
---------

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
This commit is contained in:
dongjiang 2024-10-16 22:41:30 +08:00 • committed by GitHub
parent 109f284d80
commit 5265599f58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/kubelet/controller.go
View file

@ -278,6 +278,7 @@ func (na *nodeAddress) discoveryV1Endpoint() discoveryv1.Endpoint {
Conditions: discoveryv1.EndpointConditions{
Ready: ptr.To(true),
},
NodeName: ptr.To(na.name),
TargetRef: &v1.ObjectReference{
Kind: "Node",
Name: na.name,
@ -289,7 +290,8 @@ func (na *nodeAddress) discoveryV1Endpoint() discoveryv1.Endpoint {
func (na *nodeAddress) v1EndpointAddress() v1.EndpointAddress {
return v1.EndpointAddress{
IP: na.ipAddress,
IP: na.ipAddress,
NodeName: ptr.To(na.name),
TargetRef: &v1.ObjectReference{
Kind: "Node",
Name: na.name,

13
pkg/kubelet/controller_test.go
View file

@ -284,7 +284,8 @@ func TestNodeAddressPriority(t *testing.T) {
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "node-1",
Name: "node-1",
Namespace: "abc",
},
Status: v1.NodeStatus{
Addresses: []v1.NodeAddress{
@ -315,6 +316,7 @@ func TestNodeAddressPriority(t *testing.T) {
require.Empty(t, errs)
expectedAddresses := []string{"192.168.0.100", "192.168.1.100"}
checkNodeAddresses(t, actualAddresses, expectedAddresses)
checkNodeNames(t, actualAddresses, []string{"node-0", "node-1"})
externalC := Controller{
nodeAddressPriority: "external",
@ -324,6 +326,15 @@ func TestNodeAddressPriority(t *testing.T) {
require.Empty(t, errs)
expectedAddresses = []string{"203.0.113.100", "104.27.131.189"}
checkNodeAddresses(t, actualAddresses, expectedAddresses)
checkNodeNames(t, actualAddresses, []string{"node-0", "node-1"})
}
func checkNodeNames(t *testing.T, actualAddresses []nodeAddress, expectedNodeNames []string) {
names := make([]string, 0, len(actualAddresses))
for _, addr := range actualAddresses {
names = append(names, addr.name)
}
require.Equal(t, expectedNodeNames, names)
}
func checkNodeAddresses(t *testing.T, actualAddresses []nodeAddress, expectedAddresses []string) {