admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix servicemesh options nil bug

Browse Source
This commit is contained in:
Jeff
2019-09-25 01:16:13 +08:00
committed by zryfish
parent 284c0d6425
commit d0dc66cf28
16 changed files with 48 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/simple/client/k8s/options.go
View File

@@ -14,15 +14,15 @@ type KubernetesOptions struct {
// kubernetes apiserver public address, used to generate kubeconfig
// for downloading, default to host defined in kubeconfig
// +optional
Master string `json:"master,omitempty" yaml:"master,omitempty"`
Master string `json:"master,omitempty" yaml:"master"`
// kubernetes clientset qps
// +optional
QPS float32 `json:"qps,omitemtpy" yaml:"qps,omitempty"`
QPS float32 `json:"qps,omitemtpy" yaml:"qps"`
// kubernetes clientset burst
// +optional
Burst int `json:"burst,omitempty" yaml:"burst,omitempty"`
Burst int `json:"burst,omitempty" yaml:"burst"`
}
// NewKubernetesOptions returns a `zero` instance
@@ -46,10 +46,6 @@ func (k *KubernetesOptions) Validate() []error {
}
func (k *KubernetesOptions) ApplyTo(options *KubernetesOptions) {
if options == nil {
options = k
return
}
reflectutils.Override(options, k)
}