data |
-Data contains the configuration data. Each key must be a valid DNS_SUBDOMAIN with an optional leading dot. |
+Data contains the configuration data. Each key must consist of alphanumeric characters, -, _ or .. |
false |
object |
|
@@ -8468,7 +8468,7 @@ Examples:
data |
-Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4 |
+Data contains the secret data. Each key must consist of alphanumeric characters, -, _ or .. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4 |
false |
object |
|
diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json
index 596c6b42839..84f8fd3749c 100644
--- a/federation/apis/openapi-spec/swagger.json
+++ b/federation/apis/openapi-spec/swagger.json
@@ -9472,7 +9472,7 @@
"type": "string"
},
"data": {
- "description": "Data contains the configuration data. Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.",
+ "description": "Data contains the configuration data. Each key must consist of alphanumeric characters, '-', '_' or '.'.",
"type": "object",
"additionalProperties": {
"type": "string"
@@ -11079,7 +11079,7 @@
"type": "string"
},
"data": {
- "description": "Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
+ "description": "Data contains the secret data. Each key must consist of alphanumeric characters, '-', '_' or '.'. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
"type": "object",
"additionalProperties": {
"type": "string",
diff --git a/pkg/api/types.go b/pkg/api/types.go
index ec11913d772..58f936dc8c5 100644
--- a/pkg/api/types.go
+++ b/pkg/api/types.go
@@ -3525,10 +3525,10 @@ type Secret struct {
// +optional
metav1.ObjectMeta
- // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN
- // or leading dot followed by valid DNS_SUBDOMAIN.
- // The serialized form of the secret data is a base64 encoded string,
- // representing the arbitrary (possibly non-string) data value here.
+ // Data contains the secret data. Each key must consist of alphanumeric
+ // characters, '-', '_' or '.'. The serialized form of the secret data is a
+ // base64 encoded string, representing the arbitrary (possibly non-string)
+ // data value here.
// +optional
Data map[string][]byte
@@ -3638,7 +3638,7 @@ type ConfigMap struct {
metav1.ObjectMeta
// Data contains the configuration data.
- // Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.
+ // Each key must consist of alphanumeric characters, '-', '_' or '.'.
// +optional
Data map[string]string
}
diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto
index 43206480c07..de93ef4d674 100644
--- a/pkg/api/v1/generated.proto
+++ b/pkg/api/v1/generated.proto
@@ -267,7 +267,7 @@ message ConfigMap {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Data contains the configuration data.
- // Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.
+ // Each key must consist of alphanumeric characters, '-', '_' or '.'.
// +optional
map data = 2;
}
@@ -3265,11 +3265,10 @@ message Secret {
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
- // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN
- // or leading dot followed by valid DNS_SUBDOMAIN.
- // The serialized form of the secret data is a base64 encoded string,
- // representing the arbitrary (possibly non-string) data value here.
- // Described in https://tools.ietf.org/html/rfc4648#section-4
+ // Data contains the secret data. Each key must consist of alphanumeric
+ // characters, '-', '_' or '.'. The serialized form of the secret data is a
+ // base64 encoded string, representing the arbitrary (possibly non-string)
+ // data value here. Described in https://tools.ietf.org/html/rfc4648#section-4
// +optional
map data = 2;
diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go
index d80da3ffc20..5a861ec766e 100644
--- a/pkg/api/v1/types.go
+++ b/pkg/api/v1/types.go
@@ -4052,11 +4052,10 @@ type Secret struct {
// +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
- // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN
- // or leading dot followed by valid DNS_SUBDOMAIN.
- // The serialized form of the secret data is a base64 encoded string,
- // representing the arbitrary (possibly non-string) data value here.
- // Described in https://tools.ietf.org/html/rfc4648#section-4
+ // Data contains the secret data. Each key must consist of alphanumeric
+ // characters, '-', '_' or '.'. The serialized form of the secret data is a
+ // base64 encoded string, representing the arbitrary (possibly non-string)
+ // data value here. Described in https://tools.ietf.org/html/rfc4648#section-4
// +optional
Data map[string][]byte `json:"data,omitempty" protobuf:"bytes,2,rep,name=data"`
@@ -4180,7 +4179,7 @@ type ConfigMap struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Data contains the configuration data.
- // Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.
+ // Each key must consist of alphanumeric characters, '-', '_' or '.'.
// +optional
Data map[string]string `json:"data,omitempty" protobuf:"bytes,2,rep,name=data"`
}
diff --git a/pkg/api/v1/types_swagger_doc_generated.go b/pkg/api/v1/types_swagger_doc_generated.go
index 3b850c707aa..c0218ec2974 100644
--- a/pkg/api/v1/types_swagger_doc_generated.go
+++ b/pkg/api/v1/types_swagger_doc_generated.go
@@ -173,7 +173,7 @@ func (ComponentStatusList) SwaggerDoc() map[string]string {
var map_ConfigMap = map[string]string{
"": "ConfigMap holds configuration data for pods to consume.",
"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "data": "Data contains the configuration data. Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.",
+ "data": "Data contains the configuration data. Each key must consist of alphanumeric characters, '-', '_' or '.'.",
}
func (ConfigMap) SwaggerDoc() map[string]string {
@@ -1662,7 +1662,7 @@ func (ScaleIOVolumeSource) SwaggerDoc() map[string]string {
var map_Secret = map[string]string{
"": "Secret holds secret data of a certain type. The total bytes of the values in the Data field must be less than MaxSecretSize bytes.",
"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "data": "Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
+ "data": "Data contains the secret data. Each key must consist of alphanumeric characters, '-', '_' or '.'. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
"stringData": "stringData allows specifying non-binary secret data in string form. It is provided as a write-only convenience method. All keys and values are merged into the data field on write, overwriting any existing values. It is never output when reading from the API.",
"type": "Used to facilitate programmatic handling of secret data.",
}
diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
index a3351d65526..3f7ea937ae8 100644
--- a/pkg/generated/openapi/zz_generated.openapi.go
+++ b/pkg/generated/openapi/zz_generated.openapi.go
@@ -2287,7 +2287,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
},
"data": {
SchemaProps: spec.SchemaProps{
- Description: "Data contains the configuration data. Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.",
+ Description: "Data contains the configuration data. Each key must consist of alphanumeric characters, '-', '_' or '.'.",
Type: []string{"object"},
AdditionalProperties: &spec.SchemaOrBool{
Schema: &spec.Schema{
@@ -7857,7 +7857,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
},
"data": {
SchemaProps: spec.SchemaProps{
- Description: "Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
+ Description: "Data contains the secret data. Each key must consist of alphanumeric characters, '-', '_' or '.'. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
Type: []string{"object"},
AdditionalProperties: &spec.SchemaOrBool{
Schema: &spec.Schema{
diff --git a/staging/src/k8s.io/client-go/pkg/api/types.go b/staging/src/k8s.io/client-go/pkg/api/types.go
index ec11913d772..58f936dc8c5 100644
--- a/staging/src/k8s.io/client-go/pkg/api/types.go
+++ b/staging/src/k8s.io/client-go/pkg/api/types.go
@@ -3525,10 +3525,10 @@ type Secret struct {
// +optional
metav1.ObjectMeta
- // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN
- // or leading dot followed by valid DNS_SUBDOMAIN.
- // The serialized form of the secret data is a base64 encoded string,
- // representing the arbitrary (possibly non-string) data value here.
+ // Data contains the secret data. Each key must consist of alphanumeric
+ // characters, '-', '_' or '.'. The serialized form of the secret data is a
+ // base64 encoded string, representing the arbitrary (possibly non-string)
+ // data value here.
// +optional
Data map[string][]byte
@@ -3638,7 +3638,7 @@ type ConfigMap struct {
metav1.ObjectMeta
// Data contains the configuration data.
- // Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.
+ // Each key must consist of alphanumeric characters, '-', '_' or '.'.
// +optional
Data map[string]string
}
diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
index 43206480c07..de93ef4d674 100644
--- a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
@@ -267,7 +267,7 @@ message ConfigMap {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Data contains the configuration data.
- // Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.
+ // Each key must consist of alphanumeric characters, '-', '_' or '.'.
// +optional
map data = 2;
}
@@ -3265,11 +3265,10 @@ message Secret {
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
- // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN
- // or leading dot followed by valid DNS_SUBDOMAIN.
- // The serialized form of the secret data is a base64 encoded string,
- // representing the arbitrary (possibly non-string) data value here.
- // Described in https://tools.ietf.org/html/rfc4648#section-4
+ // Data contains the secret data. Each key must consist of alphanumeric
+ // characters, '-', '_' or '.'. The serialized form of the secret data is a
+ // base64 encoded string, representing the arbitrary (possibly non-string)
+ // data value here. Described in https://tools.ietf.org/html/rfc4648#section-4
// +optional
map data = 2;
diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.go
index d80da3ffc20..5a861ec766e 100644
--- a/staging/src/k8s.io/client-go/pkg/api/v1/types.go
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.go
@@ -4052,11 +4052,10 @@ type Secret struct {
// +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
- // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN
- // or leading dot followed by valid DNS_SUBDOMAIN.
- // The serialized form of the secret data is a base64 encoded string,
- // representing the arbitrary (possibly non-string) data value here.
- // Described in https://tools.ietf.org/html/rfc4648#section-4
+ // Data contains the secret data. Each key must consist of alphanumeric
+ // characters, '-', '_' or '.'. The serialized form of the secret data is a
+ // base64 encoded string, representing the arbitrary (possibly non-string)
+ // data value here. Described in https://tools.ietf.org/html/rfc4648#section-4
// +optional
Data map[string][]byte `json:"data,omitempty" protobuf:"bytes,2,rep,name=data"`
@@ -4180,7 +4179,7 @@ type ConfigMap struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Data contains the configuration data.
- // Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.
+ // Each key must consist of alphanumeric characters, '-', '_' or '.'.
// +optional
Data map[string]string `json:"data,omitempty" protobuf:"bytes,2,rep,name=data"`
}
diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go
index 3b850c707aa..c0218ec2974 100644
--- a/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go
@@ -173,7 +173,7 @@ func (ComponentStatusList) SwaggerDoc() map[string]string {
var map_ConfigMap = map[string]string{
"": "ConfigMap holds configuration data for pods to consume.",
"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "data": "Data contains the configuration data. Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.",
+ "data": "Data contains the configuration data. Each key must consist of alphanumeric characters, '-', '_' or '.'.",
}
func (ConfigMap) SwaggerDoc() map[string]string {
@@ -1662,7 +1662,7 @@ func (ScaleIOVolumeSource) SwaggerDoc() map[string]string {
var map_Secret = map[string]string{
"": "Secret holds secret data of a certain type. The total bytes of the values in the Data field must be less than MaxSecretSize bytes.",
"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
- "data": "Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
+ "data": "Data contains the secret data. Each key must consist of alphanumeric characters, '-', '_' or '.'. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4",
"stringData": "stringData allows specifying non-binary secret data in string form. It is provided as a write-only convenience method. All keys and values are merged into the data field on write, overwriting any existing values. It is never output when reading from the API.",
"type": "Used to facilitate programmatic handling of secret data.",
}