Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
38d7c4b2
Commit
38d7c4b2
authored
Sep 26, 2016
by
Tim Hockin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Conversion: log opted-out fields
parent
7efb2d47
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
12 deletions
+32
-12
conversion.go
cmd/libs/go2idl/conversion-gen/generators/conversion.go
+8
-4
zz_generated.conversion.go
pkg/api/v1/zz_generated.conversion.go
+9
-0
zz_generated.conversion.go
pkg/apis/apps/v1alpha1/zz_generated.conversion.go
+2
-2
zz_generated.conversion.go
pkg/apis/extensions/v1beta1/zz_generated.conversion.go
+13
-6
No files found.
cmd/libs/go2idl/conversion-gen/generators/conversion.go
View file @
38d7c4b2
...
@@ -603,16 +603,19 @@ func (g *genConversion) doSlice(inType, outType *types.Type, sw *generator.Snipp
...
@@ -603,16 +603,19 @@ func (g *genConversion) doSlice(inType, outType *types.Type, sw *generator.Snipp
func
(
g
*
genConversion
)
doStruct
(
inType
,
outType
*
types
.
Type
,
sw
*
generator
.
SnippetWriter
)
{
func
(
g
*
genConversion
)
doStruct
(
inType
,
outType
*
types
.
Type
,
sw
*
generator
.
SnippetWriter
)
{
for
_
,
inMember
:=
range
inType
.
Members
{
for
_
,
inMember
:=
range
inType
.
Members
{
// Check if this member is excluded from conversion
if
tagvals
:=
extractTag
(
inMember
.
CommentLines
);
tagvals
!=
nil
&&
tagvals
[
0
]
==
"false"
{
if
tagvals
:=
extractTag
(
inMember
.
CommentLines
);
tagvals
!=
nil
&&
tagvals
[
0
]
==
"false"
{
// This field is excluded from conversion.
sw
.
Do
(
"// INFO: in."
+
inMember
.
Name
+
" opted out of conversion generation
\n
"
,
nil
)
continue
continue
}
}
outMember
,
found
:=
findMember
(
outType
,
inMember
.
Name
)
outMember
,
found
:=
findMember
(
outType
,
inMember
.
Name
)
if
!
found
{
if
!
found
{
// Since this object wasn't filtered out, this means that
// This field doesn't exist in the peer.
// this field has "+k8s:conversion-gen=false" comment to ignore it.
sw
.
Do
(
"// WARNING: in."
+
inMember
.
Name
+
" requires manual conversion: does not exist in peer-type
\n
"
,
nil
)
g
.
skippedFields
[
inType
]
=
append
(
g
.
skippedFields
[
inType
],
inMember
.
Name
)
continue
continue
}
}
inMemberType
,
outMemberType
:=
inMember
.
Type
,
outMember
.
Type
inMemberType
,
outMemberType
:=
inMember
.
Type
,
outMember
.
Type
// create a copy of both underlying types but give them the top level alias name (since aliases
// create a copy of both underlying types but give them the top level alias name (since aliases
// are assignable)
// are assignable)
...
@@ -643,7 +646,8 @@ func (g *genConversion) doStruct(inType, outType *types.Type, sw *generator.Snip
...
@@ -643,7 +646,8 @@ func (g *genConversion) doStruct(inType, outType *types.Type, sw *generator.Snip
// If we can't auto-convert, punt before we emit any code.
// If we can't auto-convert, punt before we emit any code.
if
inMemberType
.
Kind
!=
outMemberType
.
Kind
{
if
inMemberType
.
Kind
!=
outMemberType
.
Kind
{
sw
.
Do
(
"// WARNING: field '"
+
inMember
.
Name
+
"' requires manual conversion
\n
"
,
nil
)
sw
.
Do
(
"// WARNING: in."
+
inMember
.
Name
+
" requires manual conversion: inconvertible types ("
+
inMemberType
.
String
()
+
" vs "
+
outMemberType
.
String
()
+
")
\n
"
,
nil
)
g
.
skippedFields
[
inType
]
=
append
(
g
.
skippedFields
[
inType
],
inMember
.
Name
)
g
.
skippedFields
[
inType
]
=
append
(
g
.
skippedFields
[
inType
],
inMember
.
Name
)
continue
continue
}
}
...
...
pkg/api/v1/zz_generated.conversion.go
View file @
38d7c4b2
...
@@ -4926,6 +4926,9 @@ func autoConvert_v1_PodSecurityContext_To_api_PodSecurityContext(in *PodSecurity
...
@@ -4926,6 +4926,9 @@ func autoConvert_v1_PodSecurityContext_To_api_PodSecurityContext(in *PodSecurity
}
}
func
autoConvert_api_PodSecurityContext_To_v1_PodSecurityContext
(
in
*
api
.
PodSecurityContext
,
out
*
PodSecurityContext
,
s
conversion
.
Scope
)
error
{
func
autoConvert_api_PodSecurityContext_To_v1_PodSecurityContext
(
in
*
api
.
PodSecurityContext
,
out
*
PodSecurityContext
,
s
conversion
.
Scope
)
error
{
// INFO: in.HostNetwork opted out of conversion generation
// INFO: in.HostPID opted out of conversion generation
// INFO: in.HostIPC opted out of conversion generation
if
in
.
SELinuxOptions
!=
nil
{
if
in
.
SELinuxOptions
!=
nil
{
in
,
out
:=
&
in
.
SELinuxOptions
,
&
out
.
SELinuxOptions
in
,
out
:=
&
in
.
SELinuxOptions
,
&
out
.
SELinuxOptions
*
out
=
new
(
SELinuxOptions
)
*
out
=
new
(
SELinuxOptions
)
...
@@ -5017,7 +5020,11 @@ func autoConvert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conv
...
@@ -5017,7 +5020,11 @@ func autoConvert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conv
out
.
DNSPolicy
=
api
.
DNSPolicy
(
in
.
DNSPolicy
)
out
.
DNSPolicy
=
api
.
DNSPolicy
(
in
.
DNSPolicy
)
out
.
NodeSelector
=
in
.
NodeSelector
out
.
NodeSelector
=
in
.
NodeSelector
out
.
ServiceAccountName
=
in
.
ServiceAccountName
out
.
ServiceAccountName
=
in
.
ServiceAccountName
// INFO: in.DeprecatedServiceAccount opted out of conversion generation
out
.
NodeName
=
in
.
NodeName
out
.
NodeName
=
in
.
NodeName
// INFO: in.HostNetwork opted out of conversion generation
// INFO: in.HostPID opted out of conversion generation
// INFO: in.HostIPC opted out of conversion generation
if
in
.
SecurityContext
!=
nil
{
if
in
.
SecurityContext
!=
nil
{
in
,
out
:=
&
in
.
SecurityContext
,
&
out
.
SecurityContext
in
,
out
:=
&
in
.
SecurityContext
,
&
out
.
SecurityContext
*
out
=
new
(
api
.
PodSecurityContext
)
*
out
=
new
(
api
.
PodSecurityContext
)
...
@@ -5995,6 +6002,7 @@ func autoConvert_v1_Secret_To_api_Secret(in *Secret, out *api.Secret, s conversi
...
@@ -5995,6 +6002,7 @@ func autoConvert_v1_Secret_To_api_Secret(in *Secret, out *api.Secret, s conversi
return
err
return
err
}
}
out
.
Data
=
in
.
Data
out
.
Data
=
in
.
Data
// INFO: in.StringData opted out of conversion generation
out
.
Type
=
api
.
SecretType
(
in
.
Type
)
out
.
Type
=
api
.
SecretType
(
in
.
Type
)
return
nil
return
nil
}
}
...
@@ -6503,6 +6511,7 @@ func autoConvert_v1_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *api.Ser
...
@@ -6503,6 +6511,7 @@ func autoConvert_v1_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *api.Ser
out
.
ClusterIP
=
in
.
ClusterIP
out
.
ClusterIP
=
in
.
ClusterIP
out
.
Type
=
api
.
ServiceType
(
in
.
Type
)
out
.
Type
=
api
.
ServiceType
(
in
.
Type
)
out
.
ExternalIPs
=
in
.
ExternalIPs
out
.
ExternalIPs
=
in
.
ExternalIPs
// INFO: in.DeprecatedPublicIPs opted out of conversion generation
out
.
SessionAffinity
=
api
.
ServiceAffinity
(
in
.
SessionAffinity
)
out
.
SessionAffinity
=
api
.
ServiceAffinity
(
in
.
SessionAffinity
)
out
.
LoadBalancerIP
=
in
.
LoadBalancerIP
out
.
LoadBalancerIP
=
in
.
LoadBalancerIP
out
.
LoadBalancerSourceRanges
=
in
.
LoadBalancerSourceRanges
out
.
LoadBalancerSourceRanges
=
in
.
LoadBalancerSourceRanges
...
...
pkg/apis/apps/v1alpha1/zz_generated.conversion.go
View file @
38d7c4b2
...
@@ -141,7 +141,7 @@ func Convert_apps_PetSetList_To_v1alpha1_PetSetList(in *apps.PetSetList, out *Pe
...
@@ -141,7 +141,7 @@ func Convert_apps_PetSetList_To_v1alpha1_PetSetList(in *apps.PetSetList, out *Pe
}
}
func
autoConvert_v1alpha1_PetSetSpec_To_apps_PetSetSpec
(
in
*
PetSetSpec
,
out
*
apps
.
PetSetSpec
,
s
conversion
.
Scope
)
error
{
func
autoConvert_v1alpha1_PetSetSpec_To_apps_PetSetSpec
(
in
*
PetSetSpec
,
out
*
apps
.
PetSetSpec
,
s
conversion
.
Scope
)
error
{
// WARNING:
field 'Replicas' requires manual conversion
// WARNING:
in.Replicas requires manual conversion: inconvertible types (*int32 vs int)
out
.
Selector
=
in
.
Selector
out
.
Selector
=
in
.
Selector
if
err
:=
v1
.
Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
if
err
:=
v1
.
Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
return
err
return
err
...
@@ -163,7 +163,7 @@ func autoConvert_v1alpha1_PetSetSpec_To_apps_PetSetSpec(in *PetSetSpec, out *app
...
@@ -163,7 +163,7 @@ func autoConvert_v1alpha1_PetSetSpec_To_apps_PetSetSpec(in *PetSetSpec, out *app
}
}
func
autoConvert_apps_PetSetSpec_To_v1alpha1_PetSetSpec
(
in
*
apps
.
PetSetSpec
,
out
*
PetSetSpec
,
s
conversion
.
Scope
)
error
{
func
autoConvert_apps_PetSetSpec_To_v1alpha1_PetSetSpec
(
in
*
apps
.
PetSetSpec
,
out
*
PetSetSpec
,
s
conversion
.
Scope
)
error
{
// WARNING:
field 'Replicas' requires manual conversion
// WARNING:
in.Replicas requires manual conversion: inconvertible types (int vs *int32)
out
.
Selector
=
in
.
Selector
out
.
Selector
=
in
.
Selector
if
err
:=
v1
.
Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
if
err
:=
v1
.
Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
return
err
return
err
...
...
pkg/apis/extensions/v1beta1/zz_generated.conversion.go
View file @
38d7c4b2
...
@@ -942,14 +942,18 @@ func Convert_autoscaling_HorizontalPodAutoscalerList_To_v1beta1_HorizontalPodAut
...
@@ -942,14 +942,18 @@ func Convert_autoscaling_HorizontalPodAutoscalerList_To_v1beta1_HorizontalPodAut
}
}
func
autoConvert_v1beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec
(
in
*
HorizontalPodAutoscalerSpec
,
out
*
autoscaling
.
HorizontalPodAutoscalerSpec
,
s
conversion
.
Scope
)
error
{
func
autoConvert_v1beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec
(
in
*
HorizontalPodAutoscalerSpec
,
out
*
autoscaling
.
HorizontalPodAutoscalerSpec
,
s
conversion
.
Scope
)
error
{
// WARNING: in.ScaleRef requires manual conversion: does not exist in peer-type
out
.
MinReplicas
=
in
.
MinReplicas
out
.
MinReplicas
=
in
.
MinReplicas
out
.
MaxReplicas
=
in
.
MaxReplicas
out
.
MaxReplicas
=
in
.
MaxReplicas
// WARNING: in.CPUUtilization requires manual conversion: does not exist in peer-type
return
nil
return
nil
}
}
func
autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPodAutoscalerSpec
(
in
*
autoscaling
.
HorizontalPodAutoscalerSpec
,
out
*
HorizontalPodAutoscalerSpec
,
s
conversion
.
Scope
)
error
{
func
autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPodAutoscalerSpec
(
in
*
autoscaling
.
HorizontalPodAutoscalerSpec
,
out
*
HorizontalPodAutoscalerSpec
,
s
conversion
.
Scope
)
error
{
// WARNING: in.ScaleTargetRef requires manual conversion: does not exist in peer-type
out
.
MinReplicas
=
in
.
MinReplicas
out
.
MinReplicas
=
in
.
MinReplicas
out
.
MaxReplicas
=
in
.
MaxReplicas
out
.
MaxReplicas
=
in
.
MaxReplicas
// WARNING: in.TargetCPUUtilizationPercentage requires manual conversion: does not exist in peer-type
return
nil
return
nil
}
}
...
@@ -1457,6 +1461,7 @@ func autoConvert_v1beta1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpe
...
@@ -1457,6 +1461,7 @@ func autoConvert_v1beta1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpe
}
else
{
}
else
{
out
.
Selector
=
nil
out
.
Selector
=
nil
}
}
// WARNING: in.AutoSelector requires manual conversion: does not exist in peer-type
if
err
:=
v1
.
Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
if
err
:=
v1
.
Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
return
err
return
err
}
}
...
@@ -1476,6 +1481,7 @@ func autoConvert_batch_JobSpec_To_v1beta1_JobSpec(in *batch.JobSpec, out *JobSpe
...
@@ -1476,6 +1481,7 @@ func autoConvert_batch_JobSpec_To_v1beta1_JobSpec(in *batch.JobSpec, out *JobSpe
}
else
{
}
else
{
out
.
Selector
=
nil
out
.
Selector
=
nil
}
}
// WARNING: in.ManualSelector requires manual conversion: does not exist in peer-type
if
err
:=
v1
.
Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
if
err
:=
v1
.
Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec
(
&
in
.
Template
,
&
out
.
Template
,
s
);
err
!=
nil
{
return
err
return
err
}
}
...
@@ -2333,14 +2339,14 @@ func Convert_extensions_RollbackConfig_To_v1beta1_RollbackConfig(in *extensions.
...
@@ -2333,14 +2339,14 @@ func Convert_extensions_RollbackConfig_To_v1beta1_RollbackConfig(in *extensions.
}
}
func
autoConvert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment
(
in
*
RollingUpdateDeployment
,
out
*
extensions
.
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
func
autoConvert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment
(
in
*
RollingUpdateDeployment
,
out
*
extensions
.
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
// WARNING:
field 'MaxUnavailable' requires manual conversion
// WARNING:
in.MaxUnavailable requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/util/intstr.IntOrString vs k8s.io/kubernetes/pkg/util/intstr.IntOrString)
// WARNING:
field 'MaxSurge' requires manual conversion
// WARNING:
in.MaxSurge requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/util/intstr.IntOrString vs k8s.io/kubernetes/pkg/util/intstr.IntOrString)
return
nil
return
nil
}
}
func
autoConvert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment
(
in
*
extensions
.
RollingUpdateDeployment
,
out
*
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
func
autoConvert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment
(
in
*
extensions
.
RollingUpdateDeployment
,
out
*
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
// WARNING:
field 'MaxUnavailable' requires manual conversion
// WARNING:
in.MaxUnavailable requires manual conversion: inconvertible types (k8s.io/kubernetes/pkg/util/intstr.IntOrString vs *k8s.io/kubernetes/pkg/util/intstr.IntOrString)
// WARNING:
field 'MaxSurge' requires manual conversion
// WARNING:
in.MaxSurge requires manual conversion: inconvertible types (k8s.io/kubernetes/pkg/util/intstr.IntOrString vs *k8s.io/kubernetes/pkg/util/intstr.IntOrString)
return
nil
return
nil
}
}
...
@@ -2484,13 +2490,14 @@ func Convert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(in *extensions.ScaleSpec,
...
@@ -2484,13 +2490,14 @@ func Convert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(in *extensions.ScaleSpec,
func
autoConvert_v1beta1_ScaleStatus_To_extensions_ScaleStatus
(
in
*
ScaleStatus
,
out
*
extensions
.
ScaleStatus
,
s
conversion
.
Scope
)
error
{
func
autoConvert_v1beta1_ScaleStatus_To_extensions_ScaleStatus
(
in
*
ScaleStatus
,
out
*
extensions
.
ScaleStatus
,
s
conversion
.
Scope
)
error
{
out
.
Replicas
=
in
.
Replicas
out
.
Replicas
=
in
.
Replicas
// WARNING: field 'Selector' requires manual conversion
// WARNING: in.Selector requires manual conversion: inconvertible types (map[string]string vs *k8s.io/kubernetes/pkg/api/unversioned.LabelSelector)
// WARNING: in.TargetSelector requires manual conversion: does not exist in peer-type
return
nil
return
nil
}
}
func
autoConvert_extensions_ScaleStatus_To_v1beta1_ScaleStatus
(
in
*
extensions
.
ScaleStatus
,
out
*
ScaleStatus
,
s
conversion
.
Scope
)
error
{
func
autoConvert_extensions_ScaleStatus_To_v1beta1_ScaleStatus
(
in
*
extensions
.
ScaleStatus
,
out
*
ScaleStatus
,
s
conversion
.
Scope
)
error
{
out
.
Replicas
=
in
.
Replicas
out
.
Replicas
=
in
.
Replicas
// WARNING:
field 'Selector' requires manual conversion
// WARNING:
in.Selector requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/api/unversioned.LabelSelector vs map[string]string)
return
nil
return
nil
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment