diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index dc08e2cb8314e98ea1b1aaea1388b97788bf1a26..676bd62576a37199f8f6965e6cd430a58929e631 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/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 + } } } } diff --git a/pkg/controller/workspacerole/workspacerole.go b/pkg/controller/workspacerole/workspacerole.go index 445a4d72b28a5487c780bbb25f1fda54bda3df06..0ac65988b6dca82f0b245e4fbe35b8b9c926789a 100644 --- a/pkg/controller/workspacerole/workspacerole.go +++ b/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") } diff --git a/pkg/simple/client/k8s/options.go b/pkg/simple/client/k8s/options.go index 92fb2eb51f92071a39394e8b1e93c63c61a6e4ba..65c9deb5387eef9ef76556348c537c43a55a3a45 100644 --- a/pkg/simple/client/k8s/options.go +++ b/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