Skip to content

Commit 6a65718

Browse files
authored
Merge pull request kubernetes#124300 from walker-tom/update-envfromsource-docs
Update EnvFromSource.Prefix doc to mention Secret as well as ConfigMap
2 parents f64b651 + 1d4acfb commit 6a65718

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

api/openapi-spec/swagger.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/openapi-spec/v3/api__v1_openapi.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/openapi-spec/v3/apis__apps__v1_openapi.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/openapi-spec/v3/apis__batch__v1_openapi.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/core/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,9 +2263,9 @@ type SecretKeySelector struct {
22632263
Optional *bool
22642264
}
22652265

2266-
// EnvFromSource represents the source of a set of ConfigMaps
2266+
// EnvFromSource represents the source of a set of ConfigMaps or Secrets
22672267
type EnvFromSource struct {
2268-
// An optional identifier to prepend to each key in the ConfigMap.
2268+
// Optional text to prepend to the name of each environment variable. Must be a C_IDENTIFIER.
22692269
// +optional
22702270
Prefix string
22712271
// The ConfigMap to select from.

pkg/generated/openapi/zz_generated.openapi.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/core/v1/generated.proto

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/core/v1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2437,9 +2437,9 @@ type SecretKeySelector struct {
24372437
Optional *bool `json:"optional,omitempty" protobuf:"varint,3,opt,name=optional"`
24382438
}
24392439

2440-
// EnvFromSource represents the source of a set of ConfigMaps
2440+
// EnvFromSource represents the source of a set of ConfigMaps or Secrets
24412441
type EnvFromSource struct {
2442-
// An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
2442+
// Optional text to prepend to the name of each environment variable. Must be a C_IDENTIFIER.
24432443
// +optional
24442444
Prefix string `json:"prefix,omitempty" protobuf:"bytes,1,opt,name=prefix"`
24452445
// The ConfigMap to select from

staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)