diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 1c979757..4fec14cf 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -240,15 +240,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "7bf792636534"
+			"Rev": "391ed67afa7b"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "4a0861cac5e0"
+			"Rev": "3d21683b8752"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "42c1e9a4dc7a"
+			"Rev": "bc18bbf3b8f3"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index d65f2c1d..8af353e3 100644
--- a/go.mod
+++ b/go.mod
@@ -6,9 +6,9 @@ go 1.12
 
 require (
 	k8s.io/api v0.0.0-20190711103429-37c3b8b1ca65
-	k8s.io/apimachinery v0.0.0-20190711103026-7bf792636534
-	k8s.io/client-go v0.0.0-20190711103903-4a0861cac5e0
-	k8s.io/code-generator v0.0.0-20190711102700-42c1e9a4dc7a
+	k8s.io/apimachinery v0.0.0-20190711222657-391ed67afa7b
+	k8s.io/client-go v0.0.0-20190712022957-3d21683b8752
+	k8s.io/code-generator v0.0.0-20190712022531-bc18bbf3b8f3
 	k8s.io/klog v0.3.1
 )
 
@@ -20,7 +20,7 @@ replace (
 	golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
 	k8s.io/api => k8s.io/api v0.0.0-20190711103429-37c3b8b1ca65
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190711103026-7bf792636534
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190711103903-4a0861cac5e0
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190711102700-42c1e9a4dc7a
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190711222657-391ed67afa7b
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190712022957-3d21683b8752
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190712022531-bc18bbf3b8f3
 )
diff --git a/go.sum b/go.sum
index b55de8d7..b8f9398c 100644
--- a/go.sum
+++ b/go.sum
@@ -105,9 +105,9 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 k8s.io/api v0.0.0-20190711103429-37c3b8b1ca65/go.mod h1:ndtPUvriKipo+umdrlC6qqG9GNRQ8vbS0t70FMFrjuw=
-k8s.io/apimachinery v0.0.0-20190711103026-7bf792636534/go.mod h1:M2fZgZL9DbLfeJaPBCDqSqNsdsmLN+V29knYJnIXlMA=
-k8s.io/client-go v0.0.0-20190711103903-4a0861cac5e0/go.mod h1:MdhWxiGHTqqubuL4pqFLTAhEjVr0Oa6nj8mAy3kFIEI=
-k8s.io/code-generator v0.0.0-20190711102700-42c1e9a4dc7a/go.mod h1:gZ0mjdzfPz3P+cILxibAJ25xFoZ1Kf0xQrFUHy66AEs=
+k8s.io/apimachinery v0.0.0-20190711222657-391ed67afa7b/go.mod h1:M2fZgZL9DbLfeJaPBCDqSqNsdsmLN+V29knYJnIXlMA=
+k8s.io/client-go v0.0.0-20190712022957-3d21683b8752/go.mod h1:onz5S2H7DxaOs3OYPe3eahc5epaTKl79UXxRoSMo5GQ=
+k8s.io/code-generator v0.0.0-20190712022531-bc18bbf3b8f3/go.mod h1:gZ0mjdzfPz3P+cILxibAJ25xFoZ1Kf0xQrFUHy66AEs=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
index 9e1bd631..62d21b12 100644
--- a/pkg/generated/clientset/versioned/clientset.go
+++ b/pkg/generated/clientset/versioned/clientset.go
@@ -19,6 +19,8 @@ limitations under the License.
 package versioned
 
 import (
+	"fmt"
+
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
@@ -51,9 +53,14 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 }
 
 // NewForConfig creates a new Clientset for the given config.
+// If config's RateLimiter is not set and QPS and Burst are acceptable,
+// NewForConfig will generate a rate-limiter in configShallowCopy.
 func NewForConfig(c *rest.Config) (*Clientset, error) {
 	configShallowCopy := *c
 	if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 {
+		if configShallowCopy.Burst <= 0 {
+			return nil, fmt.Errorf("Burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0")
+		}
 		configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst)
 	}
 	var cs Clientset