From ac46db02c17febd1abd04dd502a4bb8fd32687b4 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Tue, 22 May 2018 14:26:00 -0700 Subject: [PATCH] fix controller tags --- samples/memcached-api-server/memcached_test.go | 4 ++-- .../pkg/controller/memcached/controller.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/memcached-api-server/memcached_test.go b/samples/memcached-api-server/memcached_test.go index 73d0fe2e82c..fe5fbdbc0f9 100644 --- a/samples/memcached-api-server/memcached_test.go +++ b/samples/memcached-api-server/memcached_test.go @@ -49,8 +49,8 @@ func TestDocs(t *testing.T) { if err != nil { t.Errorf(err.Error()) } - docsDir := filepath.Join(kubebuilderTest.Dir, "docs") - expectedDocsDir := filepath.Join(kubebuilderTest.Dir, "test", "docs") + docsDir := filepath.Join(kubebuilderTest.Dir, "docs", "reference") + expectedDocsDir := filepath.Join(kubebuilderTest.Dir, "test", "docs", "reference") err = kubebuilderTest.DiffAll(docsDir, expectedDocsDir) if err != nil { t.Errorf(err.Error()) diff --git a/samples/memcached-api-server/pkg/controller/memcached/controller.go b/samples/memcached-api-server/pkg/controller/memcached/controller.go index a77b7787b26..c09d7163b91 100644 --- a/samples/memcached-api-server/pkg/controller/memcached/controller.go +++ b/samples/memcached-api-server/pkg/controller/memcached/controller.go @@ -93,11 +93,11 @@ func (bc *MemcachedController) updateMemcachedStatus(mc *myappsv1alpha1.Memcache // +controller:group=myapps,version=v1alpha1,kind=Memcached,resource=memcacheds // +informers:group=apps,version=v1,kind=Deployment -// +rbac:rbac:groups=apps,resources=Deployment,verbs=get;list;watch;create;update;patch;delete +// +rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete // +informers:group=apps,version=v1,kind=ReplicaSet -// +rbac:rbac:groups=apps,resources=ReplicaSet,verbs=get;list;watch +// +rbac:groups=apps,resources=replicasets,verbs=get;list;watch // +informers:group=core,version=v1,kind=Pod -// +rbac:rbac:groups="",resources=Pod,verbs=get;list;watch +// +rbac:groups=core,resources=pods,verbs=get;list;watch type MemcachedController struct { args.InjectArgs