mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 15:58:37 +00:00
Merge pull request #121429 from wzshiming/fix/flake-e2e
Fix e2e for PodHostIPs
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
2aba770df8
@ -29,6 +29,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/uuid"
|
||||
netutils "k8s.io/utils/net"
|
||||
|
||||
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
||||
kubefeatures "k8s.io/kubernetes/pkg/features"
|
||||
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
@ -36,12 +37,15 @@ import (
|
||||
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
|
||||
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
|
||||
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
|
||||
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
||||
"k8s.io/kubernetes/test/e2e/network/common"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
admissionapi "k8s.io/pod-security-admission/api"
|
||||
)
|
||||
|
||||
var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
var _ = common.SIGDescribe("DualStack Host IP [Serial] [NodeFeature:PodHostIPs] [Feature:PodHostIPs]", func() {
|
||||
f := framework.NewDefaultFramework("dualstack")
|
||||
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
|
||||
|
||||
ginkgo.Context("when creating a Pod, it has no PodHostIPs feature", func() {
|
||||
tempSetCurrentKubeletConfig(f, func(ctx context.Context, initialConfig *kubeletconfig.KubeletConfiguration) {
|
||||
@ -53,20 +57,7 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
|
||||
podName := "pod-dualstack-host-ips"
|
||||
|
||||
pod := &v1.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: podName,
|
||||
Labels: map[string]string{"test": "dualstack-host-ips"},
|
||||
},
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "dualstack-host-ips",
|
||||
Image: imageutils.GetE2EImage(imageutils.Agnhost),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
pod := genPodHostIPs(podName+string(uuid.NewUUID()), false)
|
||||
|
||||
ginkgo.By("submitting the pod to kubernetes")
|
||||
podClient := e2epod.NewPodClient(f)
|
||||
@ -76,7 +67,7 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
gomega.Expect(p.Status.HostIPs).Should(gomega.BeNil())
|
||||
|
||||
ginkgo.By("deleting the pod")
|
||||
err := podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(30))
|
||||
err := podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(1))
|
||||
framework.ExpectNoError(err, "failed to delete pod")
|
||||
})
|
||||
|
||||
@ -84,21 +75,7 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
|
||||
podName := "pod-dualstack-host-ips"
|
||||
|
||||
pod := &v1.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: podName,
|
||||
Labels: map[string]string{"test": "dualstack-host-ips"},
|
||||
},
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "dualstack-host-ips",
|
||||
Image: imageutils.GetE2EImage(imageutils.Agnhost),
|
||||
},
|
||||
},
|
||||
HostNetwork: true,
|
||||
},
|
||||
}
|
||||
pod := genPodHostIPs(podName+string(uuid.NewUUID()), true)
|
||||
|
||||
ginkgo.By("submitting the pod to kubernetes")
|
||||
podClient := e2epod.NewPodClient(f)
|
||||
@ -108,7 +85,7 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
gomega.Expect(p.Status.HostIPs).Should(gomega.BeNil())
|
||||
|
||||
ginkgo.By("deleting the pod")
|
||||
err := podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(30))
|
||||
err := podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(1))
|
||||
framework.ExpectNoError(err, "failed to delete pod")
|
||||
})
|
||||
})
|
||||
@ -123,20 +100,7 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
|
||||
podName := "pod-dualstack-host-ips"
|
||||
|
||||
pod := &v1.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: podName,
|
||||
Labels: map[string]string{"test": "dualstack-host-ips"},
|
||||
},
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "dualstack-host-ips",
|
||||
Image: imageutils.GetE2EImage(imageutils.Agnhost),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
pod := genPodHostIPs(podName+string(uuid.NewUUID()), false)
|
||||
|
||||
ginkgo.By("submitting the pod to kubernetes")
|
||||
podClient := e2epod.NewPodClient(f)
|
||||
@ -170,7 +134,7 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
}
|
||||
|
||||
ginkgo.By("deleting the pod")
|
||||
err = podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(30))
|
||||
err = podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(1))
|
||||
framework.ExpectNoError(err, "failed to delete pod")
|
||||
})
|
||||
|
||||
@ -178,21 +142,7 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
|
||||
podName := "pod-dualstack-host-ips"
|
||||
|
||||
pod := &v1.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: podName,
|
||||
Labels: map[string]string{"test": "dualstack-host-ips"},
|
||||
},
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "dualstack-host-ips",
|
||||
Image: imageutils.GetE2EImage(imageutils.Agnhost),
|
||||
},
|
||||
},
|
||||
HostNetwork: true,
|
||||
},
|
||||
}
|
||||
pod := genPodHostIPs(podName+string(uuid.NewUUID()), true)
|
||||
|
||||
ginkgo.By("submitting the pod to kubernetes")
|
||||
podClient := e2epod.NewPodClient(f)
|
||||
@ -226,11 +176,15 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
}
|
||||
|
||||
ginkgo.By("deleting the pod")
|
||||
err = podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(30))
|
||||
err = podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(1))
|
||||
framework.ExpectNoError(err, "failed to delete pod")
|
||||
})
|
||||
|
||||
ginkgo.It("should provide hostIPs as an env var", func(ctx context.Context) {
|
||||
if !utilfeature.DefaultFeatureGate.Enabled(kubefeatures.PodHostIPs) {
|
||||
e2eskipper.Skipf("PodHostIPs feature is not enabled")
|
||||
}
|
||||
|
||||
podName := "downward-api-" + string(uuid.NewUUID())
|
||||
env := []v1.EnvVar{
|
||||
{
|
||||
@ -251,8 +205,84 @@ var _ = common.SIGDescribe("Dual Stack Host IP [Feature:PodHostIPs]", func() {
|
||||
testDownwardAPI(ctx, f, podName, env, expectations)
|
||||
})
|
||||
})
|
||||
|
||||
ginkgo.Context("when feature rollback", func() {
|
||||
tempSetCurrentKubeletConfig(f, func(ctx context.Context, initialConfig *kubeletconfig.KubeletConfiguration) {
|
||||
initialConfig.FeatureGates = map[string]bool{
|
||||
string(kubefeatures.PodHostIPs): true,
|
||||
}
|
||||
})
|
||||
ginkgo.It("should able upgrade and rollback", func(ctx context.Context) {
|
||||
podName := "pod-dualstack-host-ips"
|
||||
|
||||
pod := genPodHostIPs(podName+string(uuid.NewUUID()), false)
|
||||
|
||||
ginkgo.By("submitting the pod to kubernetes")
|
||||
podClient := e2epod.NewPodClient(f)
|
||||
p := podClient.CreateSync(ctx, pod)
|
||||
|
||||
gomega.Expect(p.Status.HostIPs).ShouldNot(gomega.BeNil())
|
||||
|
||||
ginkgo.By("Disable PodHostIPs feature")
|
||||
cfg, err := getCurrentKubeletConfig(ctx)
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
newCfg := cfg.DeepCopy()
|
||||
newCfg.FeatureGates = map[string]bool{
|
||||
string(kubefeatures.PodHostIPs): false,
|
||||
}
|
||||
|
||||
updateKubeletConfig(ctx, f, newCfg, true)
|
||||
|
||||
gomega.Expect(p.Status.HostIPs).ShouldNot(gomega.BeNil())
|
||||
|
||||
ginkgo.By("deleting the pod")
|
||||
err = podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(1))
|
||||
framework.ExpectNoError(err, "failed to delete pod")
|
||||
|
||||
ginkgo.By("recreate pod")
|
||||
pod = genPodHostIPs(podName+string(uuid.NewUUID()), false)
|
||||
p = podClient.CreateSync(ctx, pod)
|
||||
// Feature PodHostIPs is disabled, HostIPs should be nil
|
||||
gomega.Expect(p.Status.HostIPs).Should(gomega.BeNil())
|
||||
|
||||
newCfg.FeatureGates = map[string]bool{
|
||||
string(kubefeatures.PodHostIPs): true,
|
||||
}
|
||||
|
||||
updateKubeletConfig(ctx, f, newCfg, true)
|
||||
|
||||
p, err = podClient.Get(ctx, pod.Name, metav1.GetOptions{})
|
||||
framework.ExpectNoError(err)
|
||||
// Feature PodHostIPs is enabled, HostIPs should not be nil
|
||||
gomega.Expect(p.Status.HostIPs).ShouldNot(gomega.BeNil())
|
||||
|
||||
ginkgo.By("deleting the pod")
|
||||
err = podClient.Delete(ctx, pod.Name, *metav1.NewDeleteOptions(1))
|
||||
framework.ExpectNoError(err, "failed to delete pod")
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
func genPodHostIPs(podName string, hostNetwork bool) *v1.Pod {
|
||||
return &v1.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: podName,
|
||||
Labels: map[string]string{"test": "dualstack-host-ips"},
|
||||
},
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "test-container",
|
||||
Image: imageutils.GetE2EImage(imageutils.Agnhost),
|
||||
},
|
||||
},
|
||||
RestartPolicy: v1.RestartPolicyNever,
|
||||
HostNetwork: hostNetwork,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func testDownwardAPI(ctx context.Context, f *framework.Framework, podName string, env []v1.EnvVar, expectations []string) {
|
||||
pod := &v1.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user