Skip to content

Commit eaaae57

Browse files
authored
Use RegisterCRDs helper (#239)
1 parent 2becb35 commit eaaae57

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

glide.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/controller/controller.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212
"github.com/golang/glog"
1313
crd_api "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
1414
crd_cs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
15-
kerr "k8s.io/apimachinery/pkg/api/errors"
16-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1715
"k8s.io/apimachinery/pkg/util/runtime"
1816
"k8s.io/apimachinery/pkg/util/wait"
1917
"k8s.io/client-go/kubernetes"
@@ -122,16 +120,7 @@ func (c *StashController) ensureCustomResourceDefinitions() error {
122120
api.Restic{}.CustomResourceDefinition(),
123121
api.Recovery{}.CustomResourceDefinition(),
124122
}
125-
for _, crd := range crds {
126-
_, err := c.crdClient.CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{})
127-
if kerr.IsNotFound(err) {
128-
_, err = c.crdClient.CustomResourceDefinitions().Create(crd)
129-
if err != nil {
130-
return err
131-
}
132-
}
133-
}
134-
return apiext_util.WaitForCRDReady(c.k8sClient.CoreV1().RESTClient(), crds)
123+
return apiext_util.RegisterCRDs(c.crdClient, crds)
135124
}
136125

137126
func (c *StashController) Run(threadiness int, stopCh chan struct{}) {

vendor/github.com/appscode/kutil/apiextensions/v1beta1/kubernetes.go

Lines changed: 19 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/spf13/cobra/doc/md_docs.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)