Merge pull request #291 from craig-willis/qps

Added QPS and Burst overrides
nds-org · Sep 16, 2019 · 02a14a6 · 02a14a6
2 parents 9cd795a + d36766e
commit 02a14a6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/apiserver/cmd/server/server.go b/apiserver/cmd/server/server.go
@@ -95,6 +95,12 @@ func main() {
 	if cfg.Kubernetes.TokenPath == "" {
 		cfg.Kubernetes.TokenPath = "/run/secrets/kubernetes.io/serviceaccount/token"
 	}
+	if cfg.Kubernetes.QPS <= 0 {
+		cfg.Kubernetes.QPS = 50
+	}
+	if cfg.Kubernetes.Burst <= 0 {
+		cfg.Kubernetes.Burst = 100
+	}
 	if cfg.DefaultLimits.MemMax <= 0 {
 		cfg.DefaultLimits.MemMax = 8196 //M
 	}
@@ -144,6 +150,9 @@ func main() {
 		}
 	}
 
+	kConfig.QPS = cfg.Kubernetes.QPS
+	kConfig.Burst = cfg.Kubernetes.Burst
+
 	kube, err := kube.NewKubeHelper(cfg.Kubernetes.Address,
 		cfg.Kubernetes.Username, cfg.Kubernetes.Password, cfg.Kubernetes.TokenPath, kConfig, cfg.AuthSignInURL, cfg.AuthURL)
 	if err != nil {

diff --git a/apiserver/pkg/config/config.go b/apiserver/pkg/config/config.go
@@ -33,9 +33,9 @@ type Specs struct {
 	Path string `json:"path"`
 }
 type Volume struct {
-	Path     string     `json:"path"`
-	Name     string     `json:"name"`
-	ReadOnly bool       `json:"readOnly"`
+	Path     string `json:"path"`
+	Name     string `json:"name"`
+	ReadOnly bool   `json:"readOnly"`
 }
 
 type DefaultLimits struct {
@@ -51,13 +51,15 @@ type Etcd struct {
 	MaxMessages int    `json:"maxMessages"`
 }
 type Kubernetes struct {
-	Address            string `json:"address"`
-	TokenPath          string `json:"tokenPath"`
-	Username           string `json:"username"`
-	Password           string `json:"password"`
-	NodeSelectorName   string `json:"nodeSelectorName"`
-	NodeSelectorValue  string `json:"nodeSelectorValue"`
-	StorageClass       string `json:"pvcStorageClass"`
+	Address           string  `json:"address"`
+	TokenPath         string  `json:"tokenPath"`
+	Username          string  `json:"username"`
+	Password          string  `json:"password"`
+	NodeSelectorName  string  `json:"nodeSelectorName"`
+	NodeSelectorValue string  `json:"nodeSelectorValue"`
+	StorageClass      string  `json:"pvcStorageClass"`
+	QPS               float32 `json:"qps"`
+	Burst             int     `json:"burst"`
 }
 type Email struct {
 	Host string `json:"host"`