github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106715 from aojea/dual_hostnet_pods

Browse Source 
set secondary address on host-network pods
This commit is contained in:
Kubernetes Prow Robot 2022-02-04 12:17:30 -08:00 committed by GitHub
commit 469c4c4a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 128 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/kubelet_pods.go
View File

@ -1514,10 +1514,16 @@ func (kl *Kubelet) generateAPIPodStatus(pod *v1.Pod, podStatus *kubecontainer.Po
klog.V(4).InfoS("Cannot get host IPs", "err", err)
} else {
s.HostIP = hostIPs[0].String()
if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" {
s.PodIP = hostIPs[0].String()
s.PodIPs = []v1.PodIP{{IP: s.PodIP}}
if len(hostIPs) == 2 {
// HostNetwork Pods inherit the node IPs as PodIPs. They are immutable once set,
// other than that if the node becomes dual-stack, we add the secondary IP.
if kubecontainer.IsHostNetworkPod(pod) {
// Primary IP is not set
if s.PodIP == "" {
s.PodIP = hostIPs[0].String()
s.PodIPs = []v1.PodIP{{IP: s.PodIP}}
}
// Secondary IP is not set #105320
if len(hostIPs) == 2 && len(s.PodIPs) == 1 {
s.PodIPs = append(s.PodIPs, v1.PodIP{IP: hostIPs[1].String()})
}
}

114
pkg/kubelet/kubelet_pods_test.go
View File

@ -3284,6 +3284,7 @@ func TestGenerateAPIPodStatusHostNetworkPodIPs(t *testing.T) {
criPodIPs: []string{"192.168.0.1"},
podIPs: []v1.PodIP{
{IP: "192.168.0.1"},
{IP: "fd01::1234"},
},
},
{
@ -3349,6 +3350,119 @@ func TestGenerateAPIPodStatusHostNetworkPodIPs(t *testing.T) {
}
}
func TestNodeAddressUpdatesGenerateAPIPodStatusHostNetworkPodIPs(t *testing.T) {
testcases := []struct {
name string
nodeIPs []string
nodeAddresses []v1.NodeAddress
expectedPodIPs []v1.PodIP
}{
{
name: "Immutable after update node addresses single-stack",
nodeIPs: []string{"10.0.0.1"},
nodeAddresses: []v1.NodeAddress{
{Type: v1.NodeInternalIP, Address: "1.1.1.1"},
},
expectedPodIPs: []v1.PodIP{
{IP: "10.0.0.1"},
},
},
{
name: "Immutable after update node addresses dual-stack - primary address",
nodeIPs: []string{"10.0.0.1", "2001:db8::2"},
nodeAddresses: []v1.NodeAddress{
{Type: v1.NodeInternalIP, Address: "1.1.1.1"},
{Type: v1.NodeInternalIP, Address: "2001:db8::2"},
},
expectedPodIPs: []v1.PodIP{
{IP: "10.0.0.1"},
{IP: "2001:db8::2"},
},
},
{
name: "Immutable after update node addresses dual-stack - secondary address",
nodeIPs: []string{"10.0.0.1", "2001:db8::2"},
nodeAddresses: []v1.NodeAddress{
{Type: v1.NodeInternalIP, Address: "10.0.0.1"},
{Type: v1.NodeInternalIP, Address: "2001:db8:1:2:3::2"},
},
expectedPodIPs: []v1.PodIP{
{IP: "10.0.0.1"},
{IP: "2001:db8::2"},
},
},
{
name: "Immutable after update node addresses dual-stack - primary and secondary address",
nodeIPs: []string{"10.0.0.1", "2001:db8::2"},
nodeAddresses: []v1.NodeAddress{
{Type: v1.NodeInternalIP, Address: "1.1.1.1"},
{Type: v1.NodeInternalIP, Address: "2001:db8:1:2:3::2"},
},
expectedPodIPs: []v1.PodIP{
{IP: "10.0.0.1"},
{IP: "2001:db8::2"},
},
},
{
name: "Update secondary after new secondary address dual-stack",
nodeIPs: []string{"10.0.0.1"},
nodeAddresses: []v1.NodeAddress{
{Type: v1.NodeInternalIP, Address: "10.0.0.1"},
{Type: v1.NodeInternalIP, Address: "2001:db8::2"},
},
expectedPodIPs: []v1.PodIP{
{IP: "10.0.0.1"},
{IP: "2001:db8::2"},
},
},
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
defer testKubelet.Cleanup()
kl := testKubelet.kubelet
for _, ip := range tc.nodeIPs {
kl.nodeIPs = append(kl.nodeIPs, netutils.ParseIPSloppy(ip))
}
kl.nodeLister = testNodeLister{nodes: []*v1.Node{
{
ObjectMeta: metav1.ObjectMeta{Name: string(kl.nodeName)},
Status: v1.NodeStatus{
Addresses: tc.nodeAddresses,
},
},
}}
pod := podWithUIDNameNs("12345", "test-pod", "test-namespace")
pod.Spec.HostNetwork = true
for _, ip := range tc.nodeIPs {
pod.Status.PodIPs = append(pod.Status.PodIPs, v1.PodIP{IP: ip})
}
if len(pod.Status.PodIPs) > 0 {
pod.Status.PodIP = pod.Status.PodIPs[0].IP
}
// set old status
podStatus := &kubecontainer.PodStatus{
ID: pod.UID,
Name: pod.Name,
Namespace: pod.Namespace,
}
podStatus.IPs = tc.nodeIPs
status := kl.generateAPIPodStatus(pod, podStatus)
if !reflect.DeepEqual(status.PodIPs, tc.expectedPodIPs) {
t.Fatalf("Expected PodIPs %#v, got %#v", tc.expectedPodIPs, status.PodIPs)
}
if kl.nodeIPs[0].String() != status.PodIPs[0].IP {
t.Fatalf("Expected HostIP %q to equal PodIPs[0].IP %q", status.HostIP, status.PodIPs[0].IP)
}
})
}
}
func TestGenerateAPIPodStatusPodIPs(t *testing.T) {
testcases := []struct {
name string

1
staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.pb.go
View File

@ -1608,6 +1608,7 @@ func (m *PodIP) GetIp() string {
}
// PodSandboxNetworkStatus is the status of the network for a PodSandbox.
// Currently ignored for pods sharing the host networking namespace.
type PodSandboxNetworkStatus struct {
// IP address of the PodSandbox.
Ip string `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"`

1
staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto
View File

@ -445,6 +445,7 @@ message PodIP{
string ip = 1;
}
// PodSandboxNetworkStatus is the status of the network for a PodSandbox.
// Currently ignored for pods sharing the host networking namespace.
message PodSandboxNetworkStatus {
// IP address of the PodSandbox.
string ip = 1;

1
staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go
View File

@ -1608,6 +1608,7 @@ func (m *PodIP) GetIp() string {
}
// PodSandboxNetworkStatus is the status of the network for a PodSandbox.
// Currently ignored for pods sharing the host networking namespace.
type PodSandboxNetworkStatus struct {
// IP address of the PodSandbox.
Ip string `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"`

1
staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto
View File

@ -445,6 +445,7 @@ message PodIP{
string ip = 1;
}
// PodSandboxNetworkStatus is the status of the network for a PodSandbox.
// Currently ignored for pods sharing the host networking namespace.
message PodSandboxNetworkStatus {
// IP address of the PodSandbox.
string ip = 1;