github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18298 from pmorie/secret-env

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-20 03:55:40 -08:00
parent 6c8bf484d2 60cf252e8b
commit 1c861d43ac
21 changed files with 30624 additions and 29609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/apis/extensions/deep_copy_generated.go
View File

@@ -255,6 +255,14 @@ func deepCopy_api_EnvVarSource(in api.EnvVarSource, out *api.EnvVarSource, c *co
} else {
out.ConfigMapKeyRef = nil
}
if in.SecretKeyRef != nil {
out.SecretKeyRef = new(api.SecretKeySelector)
if err := deepCopy_api_SecretKeySelector(*in.SecretKeyRef, out.SecretKeyRef, c); err != nil {
return err
}
} else {
out.SecretKeyRef = nil
}
return nil
}
@@ -692,6 +700,14 @@ func deepCopy_api_SELinuxOptions(in api.SELinuxOptions, out *api.SELinuxOptions,
return nil
}
func deepCopy_api_SecretKeySelector(in api.SecretKeySelector, out *api.SecretKeySelector, c *conversion.Cloner) error {
if err := deepCopy_api_LocalObjectReference(in.LocalObjectReference, &out.LocalObjectReference, c); err != nil {
return err
}
out.Key = in.Key
return nil
}
func deepCopy_api_SecretVolumeSource(in api.SecretVolumeSource, out *api.SecretVolumeSource, c *conversion.Cloner) error {
out.SecretName = in.SecretName
return nil
@@ -1711,6 +1727,7 @@ func init() {
deepCopy_api_RBDVolumeSource,
deepCopy_api_ResourceRequirements,
deepCopy_api_SELinuxOptions,
deepCopy_api_SecretKeySelector,
deepCopy_api_SecretVolumeSource,
deepCopy_api_SecurityContext,
deepCopy_api_TCPSocketAction,

50
pkg/apis/extensions/v1beta1/conversion_generated.go
View File

@@ -343,6 +343,15 @@ func autoConvert_api_EnvVarSource_To_v1_EnvVarSource(in *api.EnvVarSource, out *
} else {
out.ConfigMapKeyRef = nil
}
// unable to generate simple pointer conversion for api.SecretKeySelector -> v1.SecretKeySelector
if in.SecretKeyRef != nil {
out.SecretKeyRef = new(v1.SecretKeySelector)
if err := Convert_api_SecretKeySelector_To_v1_SecretKeySelector(in.SecretKeyRef, out.SecretKeyRef, s); err != nil {
return err
}
} else {
out.SecretKeyRef = nil
}
return nil
}
@@ -950,6 +959,21 @@ func Convert_api_SELinuxOptions_To_v1_SELinuxOptions(in *api.SELinuxOptions, out
return autoConvert_api_SELinuxOptions_To_v1_SELinuxOptions(in, out, s)
}
func autoConvert_api_SecretKeySelector_To_v1_SecretKeySelector(in *api.SecretKeySelector, out *v1.SecretKeySelector, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*api.SecretKeySelector))(in)
}
if err := Convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil {
return err
}
out.Key = in.Key
return nil
}
func Convert_api_SecretKeySelector_To_v1_SecretKeySelector(in *api.SecretKeySelector, out *v1.SecretKeySelector, s conversion.Scope) error {
return autoConvert_api_SecretKeySelector_To_v1_SecretKeySelector(in, out, s)
}
func autoConvert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in *api.SecretVolumeSource, out *v1.SecretVolumeSource, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*api.SecretVolumeSource))(in)
@@ -1530,6 +1554,15 @@ func autoConvert_v1_EnvVarSource_To_api_EnvVarSource(in *v1.EnvVarSource, out *a
} else {
out.ConfigMapKeyRef = nil
}
// unable to generate simple pointer conversion for v1.SecretKeySelector -> api.SecretKeySelector
if in.SecretKeyRef != nil {
out.SecretKeyRef = new(api.SecretKeySelector)
if err := Convert_v1_SecretKeySelector_To_api_SecretKeySelector(in.SecretKeyRef, out.SecretKeyRef, s); err != nil {
return err
}
} else {
out.SecretKeyRef = nil
}
return nil
}
@@ -2113,6 +2146,21 @@ func Convert_v1_SELinuxOptions_To_api_SELinuxOptions(in *v1.SELinuxOptions, out
return autoConvert_v1_SELinuxOptions_To_api_SELinuxOptions(in, out, s)
}
func autoConvert_v1_SecretKeySelector_To_api_SecretKeySelector(in *v1.SecretKeySelector, out *api.SecretKeySelector, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*v1.SecretKeySelector))(in)
}
if err := Convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.LocalObjectReference, &out.LocalObjectReference, s); err != nil {
return err
}
out.Key = in.Key
return nil
}
func Convert_v1_SecretKeySelector_To_api_SecretKeySelector(in *v1.SecretKeySelector, out *api.SecretKeySelector, s conversion.Scope) error {
return autoConvert_v1_SecretKeySelector_To_api_SecretKeySelector(in, out, s)
}
func autoConvert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in *v1.SecretVolumeSource, out *api.SecretVolumeSource, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*v1.SecretVolumeSource))(in)
@@ -4538,6 +4586,7 @@ func init() {
autoConvert_api_RBDVolumeSource_To_v1_RBDVolumeSource,
autoConvert_api_ResourceRequirements_To_v1_ResourceRequirements,
autoConvert_api_SELinuxOptions_To_v1_SELinuxOptions,
autoConvert_api_SecretKeySelector_To_v1_SecretKeySelector,
autoConvert_api_SecretVolumeSource_To_v1_SecretVolumeSource,
autoConvert_api_SecurityContext_To_v1_SecurityContext,
autoConvert_api_TCPSocketAction_To_v1_TCPSocketAction,
@@ -4628,6 +4677,7 @@ func init() {
autoConvert_v1_RBDVolumeSource_To_api_RBDVolumeSource,
autoConvert_v1_ResourceRequirements_To_api_ResourceRequirements,
autoConvert_v1_SELinuxOptions_To_api_SELinuxOptions,
autoConvert_v1_SecretKeySelector_To_api_SecretKeySelector,
autoConvert_v1_SecretVolumeSource_To_api_SecretVolumeSource,
autoConvert_v1_SecurityContext_To_api_SecurityContext,
autoConvert_v1_TCPSocketAction_To_api_TCPSocketAction,

17
pkg/apis/extensions/v1beta1/deep_copy_generated.go
View File

@@ -291,6 +291,14 @@ func deepCopy_v1_EnvVarSource(in v1.EnvVarSource, out *v1.EnvVarSource, c *conve
} else {
out.ConfigMapKeyRef = nil
}
if in.SecretKeyRef != nil {
out.SecretKeyRef = new(v1.SecretKeySelector)
if err := deepCopy_v1_SecretKeySelector(*in.SecretKeyRef, out.SecretKeyRef, c); err != nil {
return err
}
} else {
out.SecretKeyRef = nil
}
return nil
}
@@ -729,6 +737,14 @@ func deepCopy_v1_SELinuxOptions(in v1.SELinuxOptions, out *v1.SELinuxOptions, c
return nil
}
func deepCopy_v1_SecretKeySelector(in v1.SecretKeySelector, out *v1.SecretKeySelector, c *conversion.Cloner) error {
if err := deepCopy_v1_LocalObjectReference(in.LocalObjectReference, &out.LocalObjectReference, c); err != nil {
return err
}
out.Key = in.Key
return nil
}
func deepCopy_v1_SecretVolumeSource(in v1.SecretVolumeSource, out *v1.SecretVolumeSource, c *conversion.Cloner) error {
out.SecretName = in.SecretName
return nil
@@ -1754,6 +1770,7 @@ func init() {
deepCopy_v1_RBDVolumeSource,
deepCopy_v1_ResourceRequirements,
deepCopy_v1_SELinuxOptions,
deepCopy_v1_SecretKeySelector,
deepCopy_v1_SecretVolumeSource,
deepCopy_v1_SecurityContext,
deepCopy_v1_TCPSocketAction,