Skip to content

Commit d761fe8

Browse files
authored
Merge pull request kubernetes#72774 from globervinodhn/conformance-emptyconfigmapkey-addition
Promote emptyconfigmap key e2e test to conformance test
2 parents caaad1b + a2078bd commit d761fe8

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

test/conformance/testdata/conformance.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ test/e2e/auth/service_accounts.go: "should mount an API token into pods"
3737
test/e2e/auth/service_accounts.go: "should allow opting out of API token automount"
3838
test/e2e/common/configmap.go: "should be consumable via environment variable"
3939
test/e2e/common/configmap.go: "should be consumable via the environment"
40+
test/e2e/common/configmap.go: "should fail to create ConfigMap with empty key"
4041
test/e2e/common/configmap_volume.go: "should be consumable from pods in volume"
4142
test/e2e/common/configmap_volume.go: "should be consumable from pods in volume with defaultMode set"
4243
test/e2e/common/configmap_volume.go: "should be consumable from pods in volume as non-root"

test/e2e/common/configmap.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ package common
1919
import (
2020
"fmt"
2121

22-
. "github.com/onsi/ginkgo"
23-
. "github.com/onsi/gomega"
2422
"k8s.io/api/core/v1"
2523
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2624
"k8s.io/apimachinery/pkg/util/uuid"
2725
"k8s.io/kubernetes/test/e2e/framework"
2826
imageutils "k8s.io/kubernetes/test/utils/image"
27+
28+
. "github.com/onsi/ginkgo"
29+
. "github.com/onsi/gomega"
2930
)
3031

3132
var _ = Describe("[sig-node] ConfigMap", func() {
@@ -124,7 +125,12 @@ var _ = Describe("[sig-node] ConfigMap", func() {
124125
})
125126
})
126127

127-
It("should fail to create configMap in volume due to empty configmap key", func() {
128+
/*
129+
Release : v1.14
130+
Testname: ConfigMap, with empty-key
131+
Description: Attempt to create a ConfigMap with an empty key. The creation MUST fail.
132+
*/
133+
framework.ConformanceIt("should fail to create ConfigMap with empty key", func() {
128134
configMap, err := newConfigMapWithEmptyKey(f)
129135
Expect(err).To(HaveOccurred(), "created configMap %q with empty key in namespace %q", configMap.Name, f.Namespace.Name)
130136
})

0 commit comments

Comments
 (0)