Merge pull request #2907 from wansir/master

fix: missing role template after upgrade

pkg/controller/namespace/namespace_controller.go

@@ -286,7 +286,10 @@ func (r *ReconcileNamespace) initRoles(namespace *corev1.Namespace) error {
 				old.Annotations = role.Annotations
 				old.Rules = role.Rules
 
-				return r.Update(context.Background(), &old)
+				if err := r.Update(context.Background(), &old); err != nil {
+					klog.Error(err)
+					return err
+				}
 			}
 		}
 	}

pkg/controller/workspacerole/workspacerole.go

@@ -130,7 +130,7 @@ func (c *Controller) Run(threadiness int, stopCh <-chan struct{}) error {
 		synced = append(synced, c.fedWorkspaceRoleCacheController.HasSynced)
 	}
 
-	if ok := cache.WaitForCacheSync(stopCh); !ok {
+	if ok := cache.WaitForCacheSync(stopCh, synced...); !ok {
 		return fmt.Errorf("failed to wait for caches to sync")
 	}
 

pkg/simple/client/k8s/options.go

@@ -34,7 +34,7 @@ type KubernetesOptions struct {
 
 	// kubernetes clientset qps
 	// +optional
-	QPS float32 `json:"qps,omitemtpy" yaml:"qps"`
+	QPS float32 `json:"qps,omitempty" yaml:"qps"`
 
 	// kubernetes clientset burst
 	// +optional