From 66d79aaf7558aee38c70f9a6a7ccc08fb1bf2ba9 Mon Sep 17 00:00:00 2001 From: hongming Date: Thu, 20 Aug 2020 23:06:59 +0800 Subject: [PATCH] fix: missing role template after upgrade Signed-off-by: hongming --- pkg/controller/namespace/namespace_controller.go | 5 ++++- pkg/controller/workspacerole/workspacerole.go | 2 +- pkg/simple/client/k8s/options.go | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index dc08e2cb8..676bd6257 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 445a4d72b..0ac65988b 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 92fb2eb51..65c9deb53 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