Skip to content

Commit 0f3262c

Browse files
authored
Merge pull request kubernetes#94231 from twosigma/addfqdntestgrid
Changing label to NodeAlphaFeature to include tests in Node Testgrid
2 parents 35942f6 + c74a772 commit 0f3262c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/e2e/node/pod_hostnamefqdn.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ func testPod() *v1.Pod {
6363
return pod
6464
}
6565

66-
var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN]", func() {
66+
var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN][NodeAlphaFeature:SetHostnameAsFQDN]", func() {
6767
f := framework.NewDefaultFramework("hostfqdn")
6868

6969
/*
7070
Release: v1.19
7171
Testname: Create Pod without fully qualified domain name (FQDN)
7272
Description: A Pod that does not define the subdomain field in it spec, does not have FQDN.
7373
*/
74-
ginkgo.It("a pod without subdomain field does not have FQDN [Feature:SetHostnameAsFQDN]", func() {
74+
ginkgo.It("a pod without subdomain field does not have FQDN", func() {
7575
pod := testPod()
7676
pod.Spec.Containers[0].Command = []string{"sh", "-c", "echo $(hostname)';'$(hostname -f)';'"}
7777
output := []string{fmt.Sprintf("%s;%s;", pod.ObjectMeta.Name, pod.ObjectMeta.Name)}
@@ -85,7 +85,7 @@ var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN]", func() {
8585
Description: A Pod that does not define the subdomain field in it spec, does not have FQDN.
8686
Hence, SetHostnameAsFQDN feature has no effect.
8787
*/
88-
ginkgo.It("a pod without FQDN is not affected by SetHostnameAsFQDN field [Feature:SetHostnameAsFQDN]", func() {
88+
ginkgo.It("a pod without FQDN is not affected by SetHostnameAsFQDN field", func() {
8989
pod := testPod()
9090
// Setting setHostnameAsFQDN field to true should have no effect.
9191
setHostnameAsFQDN := true
@@ -102,7 +102,7 @@ var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN]", func() {
102102
Description: A Pod that defines the subdomain field in it spec has FQDN.
103103
hostname command returns shortname (pod name in this case), and hostname -f returns FQDN.
104104
*/
105-
ginkgo.It("a pod with subdomain field has FQDN, hostname is shortname [Feature:SetHostnameAsFQDN]", func() {
105+
ginkgo.It("a pod with subdomain field has FQDN, hostname is shortname", func() {
106106
pod := testPod()
107107
pod.Spec.Containers[0].Command = []string{"sh", "-c", "echo $(hostname)';'$(hostname -f)';'"}
108108
subdomain := "t"
@@ -121,7 +121,7 @@ var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN]", func() {
121121
Description: A Pod that defines the subdomain field in it spec has FQDN. When setHostnameAsFQDN: true, the
122122
hostname is set to be the FQDN. In this case, both commands hostname and hostname -f return the FQDN of the Pod.
123123
*/
124-
ginkgo.It("a pod with subdomain field has FQDN, when setHostnameAsFQDN is set to true, the FQDN is set as hostname [Feature:SetHostnameAsFQDN]", func() {
124+
ginkgo.It("a pod with subdomain field has FQDN, when setHostnameAsFQDN is set to true, the FQDN is set as hostname", func() {
125125
pod := testPod()
126126
pod.Spec.Containers[0].Command = []string{"sh", "-c", "echo $(hostname)';'$(hostname -f)';'"}
127127
subdomain := "t"

0 commit comments

Comments
 (0)