From 3d5b6ff48e3019232fa1f2cb5d4fe388d76358b9 Mon Sep 17 00:00:00 2001 From: Jack He Date: Fri, 1 Mar 2019 16:53:02 +0800 Subject: [PATCH 1/2] Remove crd check for v1beta1 --- cmd/pytorch-operator.v1beta1/app/server.go | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/cmd/pytorch-operator.v1beta1/app/server.go b/cmd/pytorch-operator.v1beta1/app/server.go index 63187da47..7ce7db91a 100644 --- a/cmd/pytorch-operator.v1beta1/app/server.go +++ b/cmd/pytorch-operator.v1beta1/app/server.go @@ -21,7 +21,6 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/api/core/v1" - crdclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeinformers "k8s.io/client-go/informers" kubeclientset "k8s.io/client-go/kubernetes" @@ -156,13 +155,13 @@ func Run(opt *options.ServerOption) error { func createClientSets(config *restclientset.Config) (kubeclientset.Interface, kubeclientset.Interface, jobclientset.Interface, error) { - crdClient, err := crdclient.NewForConfig(config) + // crdClient, err := crdclient.NewForConfig(config) - if err != nil { - return nil, nil, nil, err - } + // if err != nil { + // return nil, nil, nil, err + // } - checkCRDExists(crdClient, v1beta1.PytorchCRD) + // checkCRDExists(crdClient, v1beta1.PytorchCRD) kubeClientSet, err := kubeclientset.NewForConfig(restclientset.AddUserAgent(config, "pytorch-operator")) if err != nil { @@ -182,11 +181,11 @@ func createClientSets(config *restclientset.Config) (kubeclientset.Interface, ku return kubeClientSet, leaderElectionClientSet, jobClientSet, nil } -func checkCRDExists(clientset crdclient.Interface, crdName string) { - _, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crdName, metav1.GetOptions{}) +// func checkCRDExists(clientset crdclient.Interface, crdName string) { +// _, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crdName, metav1.GetOptions{}) - if err != nil { - log.Error(err) - os.Exit(1) - } -} +// if err != nil { +// log.Error(err) +// os.Exit(1) +// } +// } From f792eaedc0a95ea6248827742a7f66bd17e5697e Mon Sep 17 00:00:00 2001 From: Jack He Date: Fri, 1 Mar 2019 17:40:26 +0800 Subject: [PATCH 2/2] delete crd check --- cmd/pytorch-operator.v1beta1/app/server.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cmd/pytorch-operator.v1beta1/app/server.go b/cmd/pytorch-operator.v1beta1/app/server.go index 7ce7db91a..421af567e 100644 --- a/cmd/pytorch-operator.v1beta1/app/server.go +++ b/cmd/pytorch-operator.v1beta1/app/server.go @@ -155,14 +155,6 @@ func Run(opt *options.ServerOption) error { func createClientSets(config *restclientset.Config) (kubeclientset.Interface, kubeclientset.Interface, jobclientset.Interface, error) { - // crdClient, err := crdclient.NewForConfig(config) - - // if err != nil { - // return nil, nil, nil, err - // } - - // checkCRDExists(crdClient, v1beta1.PytorchCRD) - kubeClientSet, err := kubeclientset.NewForConfig(restclientset.AddUserAgent(config, "pytorch-operator")) if err != nil { return nil, nil, nil, err @@ -180,12 +172,3 @@ func createClientSets(config *restclientset.Config) (kubeclientset.Interface, ku return kubeClientSet, leaderElectionClientSet, jobClientSet, nil } - -// func checkCRDExists(clientset crdclient.Interface, crdName string) { -// _, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crdName, metav1.GetOptions{}) - -// if err != nil { -// log.Error(err) -// os.Exit(1) -// } -// }