Skip to content

K
k3s
Commit b569a8da authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31053 from justinsb/dont_close_over_range_loops

Automatic merge from submit-queue Avoid closing over range variables
parents 48997a4c 3aa4f50a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
pkg/api/v1/conversion.go
View file @ b569a8da
...@@ -164,7 +164,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error { ...@@ -164,7 +164,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
} }
// Add field label conversions for kinds having selectable nothing but ObjectMeta fields. // Add field label conversions for kinds having selectable nothing but ObjectMeta fields.
for _, kind := range []string{ for _, k := range []string{
"Endpoints", "Endpoints",
"ResourceQuota", "ResourceQuota",
"PersistentVolumeClaim", "PersistentVolumeClaim",
...@@ -172,6 +172,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error { ...@@ -172,6 +172,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
"ServiceAccount", "ServiceAccount",
"ConfigMap", "ConfigMap",
} { } {
kind := k // don't close over range variables
err = scheme.AddFieldLabelConversionFunc("v1", kind, err = scheme.AddFieldLabelConversionFunc("v1", kind,
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
......
pkg/apis/extensions/v1beta1/conversion.go
View file @ b569a8da
...@@ -57,7 +57,8 @@ func addConversionFuncs(scheme *runtime.Scheme) error { ...@@ -57,7 +57,8 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
} }
// Add field label conversions for kinds having selectable nothing but ObjectMeta fields. // Add field label conversions for kinds having selectable nothing but ObjectMeta fields.
for _, kind := range []string{"DaemonSet", "Deployment", "Ingress"} { for _, k := range []string{"DaemonSet", "Deployment", "Ingress"} {
kind := k // don't close over range variables
err = api.Scheme.AddFieldLabelConversionFunc("extensions/v1beta1", kind, err = api.Scheme.AddFieldLabelConversionFunc("extensions/v1beta1", kind,
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment