From aec4502a73ddd3e91ce5183a83eed1b61ede9979 Mon Sep 17 00:00:00 2001 From: Leo Ryu Date: Thu, 28 Apr 2022 11:38:40 +0800 Subject: [PATCH] fix(application): allow url values to options (#1887) --- api/application/types.go | 1 + api/application/v1/types.go | 1 + api/application/v1/zz_generated.conversion.go | 31 +++++++++++++++++++ .../internalversion/platform_client.go | 5 ++- .../typed/platform/v1/platform_client.go | 3 -- 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/api/application/types.go b/api/application/types.go index 6d3ac4e38..53438b117 100644 --- a/api/application/types.go +++ b/api/application/types.go @@ -260,6 +260,7 @@ const ( AppTypeHelmV3 AppType = "HelmV3" ) +// +k8s:conversion-gen:explicit-from=net/url.Values // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // RollbackProxyOptions is the query options to an app rollback proxy call. diff --git a/api/application/v1/types.go b/api/application/v1/types.go index 9ecc647a6..553d0f9c1 100644 --- a/api/application/v1/types.go +++ b/api/application/v1/types.go @@ -260,6 +260,7 @@ const ( AppTypeHelmV3 AppType = "HelmV3" ) +// +k8s:conversion-gen:explicit-from=net/url.Values // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // RollbackProxyOptions is the query options to an app rollback proxy call. diff --git a/api/application/v1/zz_generated.conversion.go b/api/application/v1/zz_generated.conversion.go index 87d8d6ee8..7b31311c3 100644 --- a/api/application/v1/zz_generated.conversion.go +++ b/api/application/v1/zz_generated.conversion.go @@ -23,6 +23,7 @@ package v1 import ( + url "net/url" unsafe "unsafe" conversion "k8s.io/apimachinery/pkg/conversion" @@ -177,6 +178,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*url.Values)(nil), (*RollbackProxyOptions)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_url_Values_To_v1_RollbackProxyOptions(a.(*url.Values), b.(*RollbackProxyOptions), scope) + }); err != nil { + return err + } return nil } @@ -585,3 +591,28 @@ func autoConvert_application_RollbackProxyOptions_To_v1_RollbackProxyOptions(in func Convert_application_RollbackProxyOptions_To_v1_RollbackProxyOptions(in *application.RollbackProxyOptions, out *RollbackProxyOptions, s conversion.Scope) error { return autoConvert_application_RollbackProxyOptions_To_v1_RollbackProxyOptions(in, out, s) } + +func autoConvert_url_Values_To_v1_RollbackProxyOptions(in *url.Values, out *RollbackProxyOptions, s conversion.Scope) error { + // WARNING: Field TypeMeta does not have json tag, skipping. + + if values, ok := map[string][]string(*in)["revision"]; ok && len(values) > 0 { + if err := runtime.Convert_Slice_string_To_int64(&values, &out.Revision, s); err != nil { + return err + } + } else { + out.Revision = 0 + } + if values, ok := map[string][]string(*in)["cluster"]; ok && len(values) > 0 { + if err := runtime.Convert_Slice_string_To_string(&values, &out.Cluster, s); err != nil { + return err + } + } else { + out.Cluster = "" + } + return nil +} + +// Convert_url_Values_To_v1_RollbackProxyOptions is an autogenerated conversion function. +func Convert_url_Values_To_v1_RollbackProxyOptions(in *url.Values, out *RollbackProxyOptions, s conversion.Scope) error { + return autoConvert_url_Values_To_v1_RollbackProxyOptions(in, out, s) +} diff --git a/api/client/clientset/internalversion/typed/platform/internalversion/platform_client.go b/api/client/clientset/internalversion/typed/platform/internalversion/platform_client.go index 035db7ddb..c52f62e85 100644 --- a/api/client/clientset/internalversion/typed/platform/internalversion/platform_client.go +++ b/api/client/clientset/internalversion/typed/platform/internalversion/platform_client.go @@ -134,7 +134,10 @@ func setConfigDefaults(config *rest.Config) error { config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { - config.QPS = -1 + config.QPS = 5 + } + if config.Burst == 0 { + config.Burst = 10 } return nil diff --git a/api/client/clientset/versioned/typed/platform/v1/platform_client.go b/api/client/clientset/versioned/typed/platform/v1/platform_client.go index 67090721b..8688fe99d 100644 --- a/api/client/clientset/versioned/typed/platform/v1/platform_client.go +++ b/api/client/clientset/versioned/typed/platform/v1/platform_client.go @@ -133,9 +133,6 @@ func setConfigDefaults(config *rest.Config) error { config.UserAgent = rest.DefaultKubernetesUserAgent() } - if config.QPS == 0 { - config.QPS = -1 - } return nil }