Skip to content

Commit

Permalink
Bug 1877363: fix missing conversions for DeploymentLogOptions
Browse files Browse the repository at this point in the history
  • Loading branch information
soltysh committed Sep 10, 2020
1 parent 0750948 commit e75d326
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 0 deletions.
71 changes: 71 additions & 0 deletions pkg/apps/apis/apps/v1/conversion.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package v1

import (
"net/url"
"strings"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/conversion"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr"

v1 "github.com/openshift/api/apps/v1"
Expand Down Expand Up @@ -113,3 +115,72 @@ func Convert_apps_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrateg

return nil
}

func Convert_url_Values_To_v1_DeploymentLogOptions(in *url.Values, out *v1.DeploymentLogOptions, s conversion.Scope) error {
if in == nil || out == nil {
return nil
}

*out = v1.DeploymentLogOptions{}

if values, ok := map[string][]string(*in)["container"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_string(&values, &out.Container, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["follow"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_bool(&values, &out.Follow, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["previous"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_bool(&values, &out.Previous, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["sinceSeconds"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.SinceSeconds, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["sinceTime"]; ok && len(values) > 0 {
if err := metav1.Convert_Slice_string_To_Pointer_v1_Time(&values, &out.SinceTime, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["timestamps"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_bool(&values, &out.Timestamps, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["tailLines"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.TailLines, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["limitBytes"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.LimitBytes, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["nowait"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_bool(&values, &out.NoWait, s); err != nil {
return err
}
}
if values, ok := map[string][]string(*in)["version"]; ok && len(values) > 0 {
if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.Version, s); err != nil {
return err
}
}

return nil
}

// AddCustomConversionFuncs adds conversion functions which cannot be automatically generated.
// This is typically due to the objects not having 1:1 field mappings.
func AddCustomConversionFuncs(scheme *runtime.Scheme) error {
return scheme.AddConversionFunc((*url.Values)(nil), (*v1.DeploymentLogOptions)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_url_Values_To_v1_DeploymentLogOptions(a.(*url.Values), b.(*v1.DeploymentLogOptions), scope)
})
}
1 change: 1 addition & 0 deletions pkg/apps/apis/apps/v1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var (
v1.Install,
corev1conversions.AddToScheme,
extensionsv1beta1conversions.AddToScheme,
AddCustomConversionFuncs,
RegisterDefaults,
)
Install = localSchemeBuilder.AddToScheme
Expand Down

0 comments on commit e75d326

Please sign in to comment.