1. origin
  2. Commit b03b6539b1d9cff9135c0736386820aa96f58a21
Browse code

Default qps/burst to historical values

Jordan Liggitt authored on 2016/09/16 00:22:09
Showing 2 changed files
pkg/cmd/server/api/serialization_test.go
History View file @ b03b653
... ... 
@@ -54,12 +54,16 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item
54 54
55 55 
 			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides == nil {
56 56 
 				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides = &configapi.ClientConnectionOverrides{
57 
-					QPS:                2.0,
58 
-					Burst:              2,
59 57 
 					AcceptContentTypes: "test/second",
60 58 
 					ContentType:        "test/first",
61 59 
 				}
62 60 
 			}
61 
+			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.QPS <= 0 {
62 
+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.QPS = 2.0
63 
+			}
64 
+			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.Burst <= 0 {
65 
+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.Burst = 2
66 
+			}
63 67 
 			if len(obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.AcceptContentTypes) == 0 {
64 68 
 				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.AcceptContentTypes = "test/fourth"
65 69 
 			}
... ... 
@@ -68,12 +72,16 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item
68 68 
 			}
69 69 
 			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides == nil {
70 70 
 				obj.MasterClients.ExternalKubernetesClientConnectionOverrides = &configapi.ClientConnectionOverrides{
71 
-					QPS:                1.0,
72 
-					Burst:              1,
73 71 
 					AcceptContentTypes: "test/other",
74 72 
 					ContentType:        "test/third",
75 73 
 				}
76 74 
 			}
75 
+			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides.QPS <= 0 {
76 
+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides.QPS = 2.0
77 
+			}
78 
+			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides.Burst <= 0 {
79 
+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides.Burst = 2
80 
+			}
77 81 
 			if len(obj.MasterClients.ExternalKubernetesClientConnectionOverrides.AcceptContentTypes) == 0 {
78 82 
 				obj.MasterClients.ExternalKubernetesClientConnectionOverrides.AcceptContentTypes = "test/fourth"
79 83 
 			}
pkg/cmd/server/api/v1/conversions.go
History View file @ b03b653
... ... 
@@ -45,20 +45,28 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
45 45 
 				v := false
46 46 
 				obj.JenkinsPipelineConfig.AutoProvisionEnabled = &v
47 47 
 			}
48 
+
48 49 
 			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides == nil {
49 
-				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides = &ClientConnectionOverrides{
50 
-					// historical values
51 
-					QPS:   150.0,
52 
-					Burst: 300,
53 
-				}
50 
+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides = &ClientConnectionOverrides{}
51 
+			}
52 
+			// historical values
53 
+			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.QPS <= 0 {
54 
+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.QPS = 150.0
55 
+			}
56 
+			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.Burst <= 0 {
57 
+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.Burst = 300
54 58 
 			}
55 59 
 			setDefault_ClientConnectionOverrides(obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides)
60 
+
56 61 
 			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides == nil {
57 
-				obj.MasterClients.ExternalKubernetesClientConnectionOverrides = &ClientConnectionOverrides{
58 
-					// historical values
59 
-					QPS:   100.0,
60 
-					Burst: 200,
61 
-				}
62 
+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides = &ClientConnectionOverrides{}
63 
+			}
64 
+			// historical values
65 
+			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides.QPS <= 0 {
66 
+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides.QPS = 100.0
67 
+			}
68 
+			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides.Burst <= 0 {
69 
+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides.Burst = 200
62 70 
 			}
63 71 
 			setDefault_ClientConnectionOverrides(obj.MasterClients.ExternalKubernetesClientConnectionOverrides)
64 72