From 5882df8beb39f0a08722fd1fe83b5458ed733bc2 Mon Sep 17 00:00:00 2001
From: HirazawaUi <695097494plus@gmail.com>
Date: Thu, 12 Jun 2025 21:37:00 +0800
Subject: [PATCH] promote env test to conformance

---
 test/conformance/testdata/conformance.yaml | 20 ++++++++++++++++++++
 test/e2e/common/node/configmap.go          |  2 +-
 test/e2e/common/node/secrets.go            |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
index 9550d7d9825..5040bafa618 100755
--- a/test/conformance/testdata/conformance.yaml
+++ b/test/conformance/testdata/conformance.yaml
@@ -2066,6 +2066,16 @@
     watch event.
   release: v1.19
   file: test/e2e/network/service.go
+- testname: ConfigMap, from environment field with various prefixes
+  codename: '[sig-node] ConfigMap should be consumable as environment variable names
+    with various prefixes [Conformance]'
+  description: Create a Pod with environment variable values set using values from
+    ConfigMap. Allows users to use envFrom to set prefixes with various printable
+    ASCII characters excluding '=' as environment variable names. This test verifies
+    that different prefixes including digits, special characters, and letters can
+    be correctly used.
+  release: v1.34
+  file: test/e2e/common/node/configmap.go
 - testname: ConfigMap, from environment field
   codename: '[sig-node] ConfigMap should be consumable via environment variable [NodeConformance]
     [Conformance]'
@@ -2638,6 +2648,16 @@
     patch, delete, and deletecollection.'
   release: v1.20
   file: test/e2e/common/node/runtimeclass.go
+- testname: Secrets, pod environment from source
+  codename: '[sig-node] Secrets should be consumable as environment variable names
+    variable names with various prefixes [Conformance]'
+  description: Create a Pod with environment variable values set using values from
+    Secret. Allows users to use envFrom to set prefixes with various printable ASCII
+    characters excluding '=' as environment variable names. This test verifies that
+    different prefixes including digits, special characters, and letters can be correctly
+    used.
+  release: v1.34
+  file: test/e2e/common/node/secrets.go
 - testname: Secrets, pod environment field
   codename: '[sig-node] Secrets should be consumable from pods in env vars [NodeConformance]
     [Conformance]'
diff --git a/test/e2e/common/node/configmap.go b/test/e2e/common/node/configmap.go
index 94b7d35539c..6faafd94f27 100644
--- a/test/e2e/common/node/configmap.go
+++ b/test/e2e/common/node/configmap.go
@@ -250,7 +250,7 @@ var _ = SIGDescribe("ConfigMap", func() {
 		Allows users to use envFrom to set prefixes with various printable ASCII characters excluding '=' as environment variable names.
 		This test verifies that different prefixes including digits, special characters, and letters can be correctly used.
 	*/
-	framework.It("should be consumable as environment variable names with various prefixes", func(ctx context.Context) {
+	framework.ConformanceIt("should be consumable as environment variable names with various prefixes", func(ctx context.Context) {
 		name := "configmap-test-" + string(uuid.NewUUID())
 		configMap := newConfigMap(f, name)
 		ginkgo.By(fmt.Sprintf("Creating configMap %v/%v", f.Namespace.Name, configMap.Name))
diff --git a/test/e2e/common/node/secrets.go b/test/e2e/common/node/secrets.go
index 6c78158f4d1..15134187df5 100644
--- a/test/e2e/common/node/secrets.go
+++ b/test/e2e/common/node/secrets.go
@@ -246,7 +246,7 @@ var _ = SIGDescribe("Secrets", func() {
 		Allows users to use envFrom to set prefixes with various printable ASCII characters excluding '=' as environment variable names.
 		This test verifies that different prefixes including digits, special characters, and letters can be correctly used.
 	*/
-	framework.It("should be consumable as environment variable names when secret keys start with a digit", func(ctx context.Context) {
+	framework.ConformanceIt("should be consumable as environment variable names variable names with various prefixes", func(ctx context.Context) {
 		name := "secret-test-" + string(uuid.NewUUID())
 		secret := secretForTest(f.Namespace.Name, name)