diff --git a/backend/src/agent/persistence/client/BUILD.bazel b/backend/src/agent/persistence/client/BUILD.bazel index 8059d343e3c..db7bb20039f 100644 --- a/backend/src/agent/persistence/client/BUILD.bazel +++ b/backend/src/agent/persistence/client/BUILD.bazel @@ -15,7 +15,7 @@ go_library( deps = [ "//backend/api:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/client/informers/externalversions/workflow/v1alpha1:go_default_library", "@com_github_pkg_errors//:go_default_library", "@io_k8s_client_go//plugin/pkg/client/auth/gcp:go_default_library", diff --git a/backend/src/agent/persistence/client/scheduled_workflow_client.go b/backend/src/agent/persistence/client/scheduled_workflow_client.go index 2550bfc8606..341d60ed197 100644 --- a/backend/src/agent/persistence/client/scheduled_workflow_client.go +++ b/backend/src/agent/persistence/client/scheduled_workflow_client.go @@ -16,7 +16,7 @@ package client import ( "github.com/kubeflow/pipelines/backend/src/common/util" - "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1" + "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "k8s.io/client-go/tools/cache" ) @@ -27,11 +27,11 @@ type ScheduledWorkflowClientInterface interface { // ScheduledWorkflowClient is a client to call the ScheduledWorkflow API. type ScheduledWorkflowClient struct { - informer v1alpha1.ScheduledWorkflowInformer + informer v1beta1.ScheduledWorkflowInformer } // NewScheduledWorkflowClient creates an instance of the client. -func NewScheduledWorkflowClient(informer v1alpha1.ScheduledWorkflowInformer) *ScheduledWorkflowClient { +func NewScheduledWorkflowClient(informer v1beta1.ScheduledWorkflowInformer) *ScheduledWorkflowClient { return &ScheduledWorkflowClient{ informer: informer, } diff --git a/backend/src/agent/persistence/persistence_agent.go b/backend/src/agent/persistence/persistence_agent.go index 747b45b6f69..af58aa58fe9 100644 --- a/backend/src/agent/persistence/persistence_agent.go +++ b/backend/src/agent/persistence/persistence_agent.go @@ -49,7 +49,7 @@ func NewPersistenceAgent( pipelineClient *client.PipelineClient, time util.TimeInterface) *PersistenceAgent { // obtain references to shared informers - swfInformer := swfInformerFactory.Scheduledworkflow().V1alpha1().ScheduledWorkflows() + swfInformer := swfInformerFactory.Scheduledworkflow().V1beta1().ScheduledWorkflows() workflowInformer := workflowInformerFactory.Argoproj().V1alpha1().Workflows() // Add controller types to the default Kubernetes Scheme so Events can be diff --git a/backend/src/agent/persistence/worker/BUILD.bazel b/backend/src/agent/persistence/worker/BUILD.bazel index ddeb7f9382a..99e2821b640 100644 --- a/backend/src/agent/persistence/worker/BUILD.bazel +++ b/backend/src/agent/persistence/worker/BUILD.bazel @@ -37,7 +37,7 @@ go_test( "//backend/api:go_default_library", "//backend/src/agent/persistence/client:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/backend/src/agent/persistence/worker/swf_saver_test.go b/backend/src/agent/persistence/worker/swf_saver_test.go index d0adf27533d..c361172ff94 100644 --- a/backend/src/agent/persistence/worker/swf_saver_test.go +++ b/backend/src/agent/persistence/worker/swf_saver_test.go @@ -20,7 +20,7 @@ import ( "github.com/kubeflow/pipelines/backend/src/agent/persistence/client" "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" diff --git a/backend/src/apiserver/BUILD.bazel b/backend/src/apiserver/BUILD.bazel index c0e1fc4c21b..d2796b180d9 100644 --- a/backend/src/apiserver/BUILD.bazel +++ b/backend/src/apiserver/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "//backend/src/apiserver/server:go_default_library", "//backend/src/apiserver/storage:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/client/clientset/versioned/typed/workflow/v1alpha1:go_default_library", "@com_github_cenkalti_backoff//:go_default_library", "@com_github_fsnotify_fsnotify//:go_default_library", diff --git a/backend/src/apiserver/client/BUILD.bazel b/backend/src/apiserver/client/BUILD.bazel index 674e53f1278..a7af3181286 100644 --- a/backend/src/apiserver/client/BUILD.bazel +++ b/backend/src/apiserver/client/BUILD.bazel @@ -12,7 +12,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//backend/src/crd/pkg/client/clientset/versioned:go_default_library", - "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/client/clientset/versioned:go_default_library", "@com_github_argoproj_argo//pkg/client/clientset/versioned/typed/workflow/v1alpha1:go_default_library", "@com_github_cenkalti_backoff//:go_default_library", diff --git a/backend/src/apiserver/client/scheduled_workflow.go b/backend/src/apiserver/client/scheduled_workflow.go index 82ed4b24b21..4a88df8ed01 100644 --- a/backend/src/apiserver/client/scheduled_workflow.go +++ b/backend/src/apiserver/client/scheduled_workflow.go @@ -20,20 +20,20 @@ import ( "github.com/cenkalti/backoff" "github.com/golang/glog" swfclient "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned" - "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1" + "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1" "k8s.io/client-go/rest" ) // creates a new client for the Kubernetes ScheduledWorkflow CRD. -func CreateScheduledWorkflowClientOrFatal(namespace string, initConnectionTimeout time.Duration) v1alpha1.ScheduledWorkflowInterface { - var swfClient v1alpha1.ScheduledWorkflowInterface +func CreateScheduledWorkflowClientOrFatal(namespace string, initConnectionTimeout time.Duration) v1beta1.ScheduledWorkflowInterface { + var swfClient v1beta1.ScheduledWorkflowInterface var operation = func() error { restConfig, err := rest.InClusterConfig() if err != nil { return err } swfClientSet := swfclient.NewForConfigOrDie(restConfig) - swfClient = swfClientSet.ScheduledworkflowV1alpha1().ScheduledWorkflows(namespace) + swfClient = swfClientSet.ScheduledworkflowV1beta1().ScheduledWorkflows(namespace) return nil } diff --git a/backend/src/apiserver/client_manager.go b/backend/src/apiserver/client_manager.go index 1c3abdb8efb..b77eb1abdad 100644 --- a/backend/src/apiserver/client_manager.go +++ b/backend/src/apiserver/client_manager.go @@ -28,7 +28,7 @@ import ( "github.com/kubeflow/pipelines/backend/src/apiserver/model" "github.com/kubeflow/pipelines/backend/src/apiserver/storage" "github.com/kubeflow/pipelines/backend/src/common/util" - scheduledworkflowclient "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1" + scheduledworkflowclient "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1" minio "github.com/minio/minio-go" ) diff --git a/backend/src/apiserver/resource/BUILD.bazel b/backend/src/apiserver/resource/BUILD.bazel index 6752661a06b..b9338213a70 100644 --- a/backend/src/apiserver/resource/BUILD.bazel +++ b/backend/src/apiserver/resource/BUILD.bazel @@ -19,8 +19,8 @@ go_library( "//backend/src/apiserver/model:go_default_library", "//backend/src/apiserver/storage:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", - "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", + "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_argoproj_argo//pkg/client/clientset/versioned/typed/workflow/v1alpha1:go_default_library", "@com_github_golang_glog//:go_default_library", @@ -45,7 +45,7 @@ go_test( "//backend/src/apiserver/model:go_default_library", "//backend/src/apiserver/storage:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", diff --git a/backend/src/apiserver/resource/client_manager_fake.go b/backend/src/apiserver/resource/client_manager_fake.go index dd762d713a0..6eb857b131a 100644 --- a/backend/src/apiserver/resource/client_manager_fake.go +++ b/backend/src/apiserver/resource/client_manager_fake.go @@ -19,7 +19,7 @@ import ( "github.com/golang/glog" "github.com/kubeflow/pipelines/backend/src/apiserver/storage" "github.com/kubeflow/pipelines/backend/src/common/util" - scheduledworkflowclient "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1" + scheduledworkflowclient "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1" ) const ( diff --git a/backend/src/apiserver/resource/model_converter_test.go b/backend/src/apiserver/resource/model_converter_test.go index b70c6543c55..2889d8e2fbd 100644 --- a/backend/src/apiserver/resource/model_converter_test.go +++ b/backend/src/apiserver/resource/model_converter_test.go @@ -23,9 +23,9 @@ import ( "github.com/kubeflow/pipelines/backend/src/apiserver/common" "github.com/kubeflow/pipelines/backend/src/apiserver/model" "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestToModelRunMetric(t *testing.T) { @@ -133,7 +133,7 @@ func TestToModelJob(t *testing.T) { Trigger: model.Trigger{ CronSchedule: model.CronSchedule{ CronScheduleStartTimeInSec: util.Int64Pointer(1), - Cron: util.StringPointer("1 * * * *"), + Cron: util.StringPointer("1 * * * *"), }, }, MaxConcurrency: 1, diff --git a/backend/src/apiserver/resource/resource_manager.go b/backend/src/apiserver/resource/resource_manager.go index 3371918ed94..f4302cbc9ef 100644 --- a/backend/src/apiserver/resource/resource_manager.go +++ b/backend/src/apiserver/resource/resource_manager.go @@ -28,8 +28,8 @@ import ( "github.com/kubeflow/pipelines/backend/src/apiserver/model" "github.com/kubeflow/pipelines/backend/src/apiserver/storage" "github.com/kubeflow/pipelines/backend/src/common/util" - scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" - scheduledworkflowclient "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1" + scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" + scheduledworkflowclient "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1" "github.com/pkg/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/backend/src/apiserver/resource/resource_manager_test.go b/backend/src/apiserver/resource/resource_manager_test.go index d9a26140d49..556f11ee506 100644 --- a/backend/src/apiserver/resource/resource_manager_test.go +++ b/backend/src/apiserver/resource/resource_manager_test.go @@ -28,7 +28,7 @@ import ( "github.com/kubeflow/pipelines/backend/src/apiserver/model" "github.com/kubeflow/pipelines/backend/src/apiserver/storage" "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" @@ -724,7 +724,7 @@ func TestReportWorkflowResource_ScheduledWorkflowIDNotEmpty_Success(t *testing.T Namespace: "MY_NAMESPACE", UID: "WORKFLOW_1", OwnerReferences: []v1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID(job.UUID), @@ -791,7 +791,7 @@ func TestReportWorkflowResource_ScheduledWorkflowIDNotEmpty_ExperimentNotFound(t Namespace: "MY_NAMESPACE", UID: "WORKFLOW_1", OwnerReferences: []v1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID(newJob.UUID), @@ -978,7 +978,7 @@ func TestReadArtifact_Succeed(t *testing.T) { UID: "run-1", CreationTimestamp: v1.NewTime(time.Unix(11, 0).UTC()), OwnerReferences: []v1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID(job.UUID), @@ -1022,7 +1022,7 @@ func TestReadArtifact_WorkflowNoStatus_NotFound(t *testing.T) { UID: "run-1", CreationTimestamp: v1.NewTime(time.Unix(11, 0).UTC()), OwnerReferences: []v1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID(job.UUID), diff --git a/backend/src/apiserver/resource/resource_manager_util.go b/backend/src/apiserver/resource/resource_manager_util.go index 091bcae32de..59753918f33 100644 --- a/backend/src/apiserver/resource/resource_manager_util.go +++ b/backend/src/apiserver/resource/resource_manager_util.go @@ -21,7 +21,7 @@ import ( api "github.com/kubeflow/pipelines/backend/api/go_client" "github.com/kubeflow/pipelines/backend/src/common/util" - scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/backend/src/apiserver/resource/resource_manager_util_test.go b/backend/src/apiserver/resource/resource_manager_util_test.go index f2cda2b7822..6de6a300e19 100644 --- a/backend/src/apiserver/resource/resource_manager_util_test.go +++ b/backend/src/apiserver/resource/resource_manager_util_test.go @@ -20,7 +20,7 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" api "github.com/kubeflow/pipelines/backend/api/go_client" - scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/backend/src/apiserver/resource/scheduled_workflow_fake.go b/backend/src/apiserver/resource/scheduled_workflow_fake.go index 543fbbb5d5a..47baefd7153 100644 --- a/backend/src/apiserver/resource/scheduled_workflow_fake.go +++ b/backend/src/apiserver/resource/scheduled_workflow_fake.go @@ -18,23 +18,23 @@ import ( "errors" "github.com/golang/glog" - "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" ) type FakeScheduledWorkflowClient struct { - workflows map[string]*v1alpha1.ScheduledWorkflow + workflows map[string]*v1beta1.ScheduledWorkflow } func NewScheduledWorkflowClientFake() *FakeScheduledWorkflowClient { return &FakeScheduledWorkflowClient{ - workflows: make(map[string]*v1alpha1.ScheduledWorkflow), + workflows: make(map[string]*v1beta1.ScheduledWorkflow), } } -func (c *FakeScheduledWorkflowClient) Create(workflow *v1alpha1.ScheduledWorkflow) (*v1alpha1.ScheduledWorkflow, error) { +func (c *FakeScheduledWorkflowClient) Create(workflow *v1beta1.ScheduledWorkflow) (*v1beta1.ScheduledWorkflow, error) { workflow.UID = "123" workflow.Namespace = "default" workflow.Name = workflow.GenerateName @@ -47,11 +47,11 @@ func (c *FakeScheduledWorkflowClient) Delete(name string, options *v1.DeleteOpti return nil } -func (c *FakeScheduledWorkflowClient) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ScheduledWorkflow, err error) { +func (c *FakeScheduledWorkflowClient) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ScheduledWorkflow, err error) { return nil, nil } -func (c *FakeScheduledWorkflowClient) Get(name string, options v1.GetOptions) (*v1alpha1.ScheduledWorkflow, error) { +func (c *FakeScheduledWorkflowClient) Get(name string, options v1.GetOptions) (*v1beta1.ScheduledWorkflow, error) { workflow, ok := c.workflows[name] if ok { return workflow, nil @@ -59,7 +59,7 @@ func (c *FakeScheduledWorkflowClient) Get(name string, options v1.GetOptions) (* return nil, errors.New("not found") } -func (c *FakeScheduledWorkflowClient) Update(*v1alpha1.ScheduledWorkflow) (*v1alpha1.ScheduledWorkflow, error) { +func (c *FakeScheduledWorkflowClient) Update(*v1beta1.ScheduledWorkflow) (*v1beta1.ScheduledWorkflow, error) { glog.Error("This fake method is not yet implemented.") return nil, nil } @@ -69,7 +69,7 @@ func (c *FakeScheduledWorkflowClient) DeleteCollection(options *v1.DeleteOptions return nil } -func (c *FakeScheduledWorkflowClient) List(opts v1.ListOptions) (*v1alpha1.ScheduledWorkflowList, error) { +func (c *FakeScheduledWorkflowClient) List(opts v1.ListOptions) (*v1beta1.ScheduledWorkflowList, error) { glog.Error("This fake method is not yet implemented.") return nil, nil } @@ -83,14 +83,14 @@ type FakeBadScheduledWorkflowClient struct { FakeScheduledWorkflowClient } -func (FakeBadScheduledWorkflowClient) Create(workflow *v1alpha1.ScheduledWorkflow) (*v1alpha1.ScheduledWorkflow, error) { +func (FakeBadScheduledWorkflowClient) Create(workflow *v1beta1.ScheduledWorkflow) (*v1beta1.ScheduledWorkflow, error) { return nil, errors.New("some error") } -func (FakeBadScheduledWorkflowClient) Get(name string, options v1.GetOptions) (*v1alpha1.ScheduledWorkflow, error) { +func (FakeBadScheduledWorkflowClient) Get(name string, options v1.GetOptions) (*v1beta1.ScheduledWorkflow, error) { return nil, errors.New("some error") } -func (FakeBadScheduledWorkflowClient) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ScheduledWorkflow, err error) { +func (FakeBadScheduledWorkflowClient) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ScheduledWorkflow, err error) { return nil, errors.New("some error") } diff --git a/backend/src/apiserver/resource/workflow_fake.go b/backend/src/apiserver/resource/workflow_fake.go index 35f2a70366d..a8800b44b53 100644 --- a/backend/src/apiserver/resource/workflow_fake.go +++ b/backend/src/apiserver/resource/workflow_fake.go @@ -20,7 +20,7 @@ import ( "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" "github.com/golang/glog" "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" ) diff --git a/backend/src/apiserver/server/BUILD.bazel b/backend/src/apiserver/server/BUILD.bazel index 5c3d867a2d6..e72c46b11e1 100644 --- a/backend/src/apiserver/server/BUILD.bazel +++ b/backend/src/apiserver/server/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "//backend/src/apiserver/model:go_default_library", "//backend/src/apiserver/resource:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_golang_glog//:go_default_library", "@com_github_golang_protobuf//jsonpb:go_default_library_gen", @@ -61,7 +61,7 @@ go_test( "//backend/src/apiserver/resource:go_default_library", "//backend/src/apiserver/storage:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_google_go_cmp//cmp:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", diff --git a/backend/src/apiserver/server/report_server.go b/backend/src/apiserver/server/report_server.go index ed69a18b8ec..323ca400b65 100644 --- a/backend/src/apiserver/server/report_server.go +++ b/backend/src/apiserver/server/report_server.go @@ -23,7 +23,7 @@ import ( api "github.com/kubeflow/pipelines/backend/api/go_client" "github.com/kubeflow/pipelines/backend/src/apiserver/resource" "github.com/kubeflow/pipelines/backend/src/common/util" - scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" ) type ReportServer struct { diff --git a/backend/src/apiserver/server/report_server_test.go b/backend/src/apiserver/server/report_server_test.go index 020fad3e749..ae5029e4195 100644 --- a/backend/src/apiserver/server/report_server_test.go +++ b/backend/src/apiserver/server/report_server_test.go @@ -8,7 +8,7 @@ import ( workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" api "github.com/kubeflow/pipelines/backend/api/go_client" "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -69,7 +69,7 @@ func TestValidateReportWorkflowRequest(t *testing.T) { Namespace: "MY_NAMESPACE", UID: "1", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID("1"), @@ -96,7 +96,7 @@ func TestValidateReportWorkflowRequest_MissingField(t *testing.T) { Namespace: "MY_NAMESPACE", UID: "1", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID("1"), @@ -114,7 +114,7 @@ func TestValidateReportWorkflowRequest_MissingField(t *testing.T) { Name: "MY_NAME", UID: "1", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID("1"), @@ -133,7 +133,7 @@ func TestValidateReportWorkflowRequest_MissingField(t *testing.T) { Name: "MY_NAME", Namespace: "MY_NAMESPACE", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID("1"), diff --git a/backend/src/apiserver/server/test_util.go b/backend/src/apiserver/server/test_util.go index 3f2ea62e579..1712f571991 100644 --- a/backend/src/apiserver/server/test_util.go +++ b/backend/src/apiserver/server/test_util.go @@ -24,7 +24,7 @@ import ( "github.com/kubeflow/pipelines/backend/src/common/util" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) var testWorkflow = util.NewWorkflow(&v1alpha1.Workflow{ diff --git a/backend/src/apiserver/storage/BUILD.bazel b/backend/src/apiserver/storage/BUILD.bazel index 16379f2bea8..5daef16c02f 100644 --- a/backend/src/apiserver/storage/BUILD.bazel +++ b/backend/src/apiserver/storage/BUILD.bazel @@ -60,7 +60,7 @@ go_test( "//backend/src/apiserver/list:go_default_library", "//backend/src/apiserver/model:go_default_library", "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_masterminds_squirrel//:go_default_library", "@com_github_minio_minio_go//:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/backend/src/apiserver/storage/job_store_test.go b/backend/src/apiserver/storage/job_store_test.go index b3c078be90a..a5f1c2cf9e0 100644 --- a/backend/src/apiserver/storage/job_store_test.go +++ b/backend/src/apiserver/storage/job_store_test.go @@ -22,7 +22,7 @@ import ( "github.com/kubeflow/pipelines/backend/src/apiserver/list" "github.com/kubeflow/pipelines/backend/src/apiserver/model" "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/backend/src/common/util/BUILD.bazel b/backend/src/common/util/BUILD.bazel index 74849881b17..b1925073e31 100644 --- a/backend/src/common/util/BUILD.bazel +++ b/backend/src/common/util/BUILD.bazel @@ -23,7 +23,7 @@ go_library( deps = [ "//backend/api:go_default_library", "//backend/src/crd/pkg/apis/scheduledworkflow:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_cenkalti_backoff//:go_default_library", "@com_github_ghodss_yaml//:go_default_library", @@ -60,7 +60,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_ghodss_yaml//:go_default_library", "@com_github_kataras_iris//core/errors:go_default_library", diff --git a/backend/src/common/util/formatter.go b/backend/src/common/util/formatter.go index 137fa50edcc..6e700b4de7c 100644 --- a/backend/src/common/util/formatter.go +++ b/backend/src/common/util/formatter.go @@ -61,7 +61,7 @@ func (p *WorkflowFormatter) Format(workflow *v1alpha1.Workflow) error { func getWorkflowName(workflow *v1alpha1.Workflow) string { - const( + const ( defaultWorkflowName = "workflow-" ) @@ -159,4 +159,3 @@ func (p *WorkflowFormatter) createSubtitute(match string) (string, error) { return match, nil } } - diff --git a/backend/src/common/util/formatter_test.go b/backend/src/common/util/formatter_test.go index f18b2ae2bca..61376b5e8d7 100644 --- a/backend/src/common/util/formatter_test.go +++ b/backend/src/common/util/formatter_test.go @@ -21,7 +21,7 @@ import ( "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" "github.com/kataras/iris/core/errors" "github.com/stretchr/testify/assert" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( diff --git a/backend/src/common/util/scheduled_workflow.go b/backend/src/common/util/scheduled_workflow.go index a7c45d59584..d3fc9743ac1 100644 --- a/backend/src/common/util/scheduled_workflow.go +++ b/backend/src/common/util/scheduled_workflow.go @@ -17,7 +17,7 @@ package util import ( workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" "github.com/golang/glog" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "k8s.io/apimachinery/pkg/util/json" ) diff --git a/backend/src/common/util/scheduled_workflow_test.go b/backend/src/common/util/scheduled_workflow_test.go index acbec321ec3..8b7262623d4 100644 --- a/backend/src/common/util/scheduled_workflow_test.go +++ b/backend/src/common/util/scheduled_workflow_test.go @@ -19,7 +19,7 @@ import ( "time" workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/core" diff --git a/backend/src/common/util/workflow.go b/backend/src/common/util/workflow.go index c911587020f..6cbad6885b6 100644 --- a/backend/src/common/util/workflow.go +++ b/backend/src/common/util/workflow.go @@ -18,7 +18,7 @@ import ( workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" "github.com/golang/glog" swfregister "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/json" diff --git a/backend/src/common/util/workflow_test.go b/backend/src/common/util/workflow_test.go index b1122e7d71a..0482bbcfcce 100644 --- a/backend/src/common/util/workflow_test.go +++ b/backend/src/common/util/workflow_test.go @@ -18,7 +18,7 @@ import ( "testing" workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -30,7 +30,7 @@ func TestWorkflow_ScheduledWorkflowUUIDAsStringOrEmpty(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "WORKFLOW_NAME", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", UID: types.UID("MY_UID"), @@ -45,7 +45,7 @@ func TestWorkflow_ScheduledWorkflowUUIDAsStringOrEmpty(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "WORKFLOW_NAME", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", UID: types.UID("MY_UID"), }}, }, @@ -58,7 +58,7 @@ func TestWorkflow_ScheduledWorkflowUUIDAsStringOrEmpty(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "WORKFLOW_NAME", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "WRONG_KIND", Name: "SCHEDULE_NAME", UID: types.UID("MY_UID"), @@ -87,7 +87,7 @@ func TestWorkflow_ScheduledWorkflowUUIDAsStringOrEmpty(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "WORKFLOW_NAME", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", }}, @@ -240,7 +240,7 @@ func TestWorkflow_SetOwnerReferences(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "WORKFLOW_NAME", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE_NAME", Controller: BoolPointer(true), diff --git a/backend/src/crd/README.md b/backend/src/crd/README.md index db14890fb02..7415311c66b 100644 --- a/backend/src/crd/README.md +++ b/backend/src/crd/README.md @@ -94,7 +94,7 @@ Namespace: default Labels: scheduledworkflows.kubeflow.org/enabled=true scheduledworkflows.kubeflow.org/status=Enabled Annotations: -API Version: kubeflow.org/v1alpha1 +API Version: kubeflow.org/v1beta1 Kind: ScheduledWorkflow Metadata: Cluster Name: @@ -102,7 +102,7 @@ Metadata: Generation: 0 Initializers: Resource Version: 3056202 - Self Link: /apis/kubeflow.org/v1alpha1/namespaces/default/scheduledworkflows/every-minute-cron + Self Link: /apis/kubeflow.org/v1beta1/namespaces/default/scheduledworkflows/every-minute-cron UID: 6b11874e-6928-11e8-9fd5-42010a8a0021 Spec: Enabled: true diff --git a/backend/src/crd/controller/scheduledworkflow/BUILD.bazel b/backend/src/crd/controller/scheduledworkflow/BUILD.bazel index 2de3d064208..d074bf79459 100644 --- a/backend/src/crd/controller/scheduledworkflow/BUILD.bazel +++ b/backend/src/crd/controller/scheduledworkflow/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//backend/src/crd/controller/scheduledworkflow/client:go_default_library", "//backend/src/crd/controller/scheduledworkflow/util:go_default_library", "//backend/src/crd/pkg/apis/scheduledworkflow:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "//backend/src/crd/pkg/client/clientset/versioned:go_default_library", "//backend/src/crd/pkg/client/clientset/versioned/scheme:go_default_library", "//backend/src/crd/pkg/client/informers/externalversions:go_default_library", diff --git a/backend/src/crd/controller/scheduledworkflow/client/BUILD.bazel b/backend/src/crd/controller/scheduledworkflow/client/BUILD.bazel index 909d29637af..e27c33df3ce 100644 --- a/backend/src/crd/controller/scheduledworkflow/client/BUILD.bazel +++ b/backend/src/crd/controller/scheduledworkflow/client/BUILD.bazel @@ -12,9 +12,9 @@ go_library( deps = [ "//backend/src/common/util:go_default_library", "//backend/src/crd/controller/scheduledworkflow/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "//backend/src/crd/pkg/client/clientset/versioned:go_default_library", - "//backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_argoproj_argo//pkg/client/clientset/versioned:go_default_library", "@com_github_argoproj_argo//pkg/client/informers/externalversions/workflow/v1alpha1:go_default_library", @@ -35,7 +35,7 @@ go_test( embed = [":go_default_library"], deps = [ "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_argoproj_argo//workflow/common:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", diff --git a/backend/src/crd/controller/scheduledworkflow/client/kube_client.go b/backend/src/crd/controller/scheduledworkflow/client/kube_client.go index ddc104c379a..51ac30fc591 100644 --- a/backend/src/crd/controller/scheduledworkflow/client/kube_client.go +++ b/backend/src/crd/controller/scheduledworkflow/client/kube_client.go @@ -17,7 +17,7 @@ package client import ( "fmt" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" diff --git a/backend/src/crd/controller/scheduledworkflow/client/swf_client.go b/backend/src/crd/controller/scheduledworkflow/client/swf_client.go index d601595468b..45c49e71365 100644 --- a/backend/src/crd/controller/scheduledworkflow/client/swf_client.go +++ b/backend/src/crd/controller/scheduledworkflow/client/swf_client.go @@ -17,7 +17,7 @@ package client import ( "github.com/kubeflow/pipelines/backend/src/crd/controller/scheduledworkflow/util" swfclientset "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned" - "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1" + "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "k8s.io/client-go/tools/cache" ) @@ -25,12 +25,12 @@ import ( // ScheduledWorkflowClient is a client to call the ScheduledWorkflow API. type ScheduledWorkflowClient struct { clientSet swfclientset.Interface - informer v1alpha1.ScheduledWorkflowInformer + informer v1beta1.ScheduledWorkflowInformer } // NewScheduledWorkflowClient creates an instance of the client. func NewScheduledWorkflowClient(clientSet swfclientset.Interface, - informer v1alpha1.ScheduledWorkflowInformer) *ScheduledWorkflowClient { + informer v1beta1.ScheduledWorkflowInformer) *ScheduledWorkflowClient { return &ScheduledWorkflowClient{ clientSet: clientSet, informer: informer, @@ -60,7 +60,7 @@ func (p *ScheduledWorkflowClient) Get(namespace string, name string) (*util.Sche // Update Updates a ScheduledWorkflow in the Kubernetes API server. func (p *ScheduledWorkflowClient) Update(namespace string, schedule *util.ScheduledWorkflow) error { - _, err := p.clientSet.ScheduledworkflowV1alpha1().ScheduledWorkflows(namespace). + _, err := p.clientSet.ScheduledworkflowV1beta1().ScheduledWorkflows(namespace). Update(schedule.Get()) return err } diff --git a/backend/src/crd/controller/scheduledworkflow/client/workflow_client.go b/backend/src/crd/controller/scheduledworkflow/client/workflow_client.go index 48d4ca385dd..958e8414022 100644 --- a/backend/src/crd/controller/scheduledworkflow/client/workflow_client.go +++ b/backend/src/crd/controller/scheduledworkflow/client/workflow_client.go @@ -22,7 +22,7 @@ import ( "github.com/argoproj/argo/pkg/client/informers/externalversions/workflow/v1alpha1" commonutil "github.com/kubeflow/pipelines/backend/src/common/util" "github.com/kubeflow/pipelines/backend/src/crd/controller/scheduledworkflow/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" wraperror "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/backend/src/crd/controller/scheduledworkflow/client/workflow_client_test.go b/backend/src/crd/controller/scheduledworkflow/client/workflow_client_test.go index f47e467c588..d9773fda03e 100644 --- a/backend/src/crd/controller/scheduledworkflow/client/workflow_client_test.go +++ b/backend/src/crd/controller/scheduledworkflow/client/workflow_client_test.go @@ -21,7 +21,7 @@ import ( workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" workflowcommon "github.com/argoproj/argo/workflow/common" commonutil "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/backend/src/crd/controller/scheduledworkflow/controller.go b/backend/src/crd/controller/scheduledworkflow/controller.go index ea5d9dd745d..5ef7d17dc74 100644 --- a/backend/src/crd/controller/scheduledworkflow/controller.go +++ b/backend/src/crd/controller/scheduledworkflow/controller.go @@ -25,7 +25,7 @@ import ( "github.com/kubeflow/pipelines/backend/src/crd/controller/scheduledworkflow/client" "github.com/kubeflow/pipelines/backend/src/crd/controller/scheduledworkflow/util" swfregister "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" swfclientset "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned" swfScheme "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/scheme" swfinformers "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions" @@ -83,7 +83,7 @@ func NewController( time commonutil.TimeInterface) *Controller { // obtain references to shared informers - swfInformer := swfInformerFactory.Scheduledworkflow().V1alpha1().ScheduledWorkflows() + swfInformer := swfInformerFactory.Scheduledworkflow().V1beta1().ScheduledWorkflows() workflowInformer := workflowInformerFactory.Argoproj().V1alpha1().Workflows() // Add controller types to the default Kubernetes Scheme so Events can be diff --git a/backend/src/crd/controller/scheduledworkflow/util/BUILD.bazel b/backend/src/crd/controller/scheduledworkflow/util/BUILD.bazel index 26867e74a15..4f340d5c8d5 100644 --- a/backend/src/crd/controller/scheduledworkflow/util/BUILD.bazel +++ b/backend/src/crd/controller/scheduledworkflow/util/BUILD.bazel @@ -14,7 +14,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_argoproj_argo//workflow/common:go_default_library", "@com_github_pkg_errors//:go_default_library", @@ -38,7 +38,7 @@ go_test( embed = [":go_default_library"], deps = [ "//backend/src/common/util:go_default_library", - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/backend/src/crd/controller/scheduledworkflow/util/cron_schedule.go b/backend/src/crd/controller/scheduledworkflow/util/cron_schedule.go index dc0b0731c81..52b74b29101 100644 --- a/backend/src/crd/controller/scheduledworkflow/util/cron_schedule.go +++ b/backend/src/crd/controller/scheduledworkflow/util/cron_schedule.go @@ -18,7 +18,7 @@ import ( "math" "time" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" wraperror "github.com/pkg/errors" "github.com/robfig/cron" log "github.com/sirupsen/logrus" diff --git a/backend/src/crd/controller/scheduledworkflow/util/cron_schedule_test.go b/backend/src/crd/controller/scheduledworkflow/util/cron_schedule_test.go index 502d923b24b..dac87a00865 100644 --- a/backend/src/crd/controller/scheduledworkflow/util/cron_schedule_test.go +++ b/backend/src/crd/controller/scheduledworkflow/util/cron_schedule_test.go @@ -20,7 +20,7 @@ import ( "time" commonutil "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule.go b/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule.go index 4fd2f7ed950..6d18abad1e9 100644 --- a/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule.go +++ b/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule.go @@ -17,7 +17,7 @@ package util import ( "math" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" log "github.com/sirupsen/logrus" ) diff --git a/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule_test.go b/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule_test.go index 5ccc724b10d..ce1c7905252 100644 --- a/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule_test.go +++ b/backend/src/crd/controller/scheduledworkflow/util/periodic_schedule_test.go @@ -20,7 +20,7 @@ import ( "time" commonutil "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow.go b/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow.go index e18bc67c537..395ab27e0b5 100644 --- a/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow.go +++ b/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow.go @@ -24,7 +24,7 @@ import ( workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" commonutil "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/core" ) diff --git a/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow_test.go b/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow_test.go index 11202c87fba..da3f6a49f26 100644 --- a/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow_test.go +++ b/backend/src/crd/controller/scheduledworkflow/util/scheduled_workflow_test.go @@ -22,7 +22,7 @@ import ( workflowapi "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" commonutil "github.com/kubeflow/pipelines/backend/src/common/util" - swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + swfapi "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/core" @@ -582,7 +582,7 @@ func TestScheduledWorkflow_NewWorkflow(t *testing.T) { "scheduledworkflows.kubeflow.org/workflowEpoch": strconv.Itoa(int(scheduledEpoch)), "scheduledworkflows.kubeflow.org/workflowIndex": "1"}, OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE1", UID: "", @@ -655,7 +655,7 @@ func TestScheduledWorkflow_NewWorkflow_Parameterized(t *testing.T) { "scheduledworkflows.kubeflow.org/workflowEpoch": strconv.Itoa(int(scheduledEpoch)), "scheduledworkflows.kubeflow.org/workflowIndex": "1"}, OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "ScheduledWorkflow", Name: "SCHEDULE1", UID: "", diff --git a/backend/src/crd/controller/viewer/BUILD.bazel b/backend/src/crd/controller/viewer/BUILD.bazel index 1bdf39fbd8c..cc7371d9037 100644 --- a/backend/src/crd/controller/viewer/BUILD.bazel +++ b/backend/src/crd/controller/viewer/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:private"], deps = [ "//backend/src/crd/controller/viewer/reconciler:go_default_library", - "//backend/src/crd/pkg/apis/viewer/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/viewer/v1beta1:go_default_library", "//backend/src/crd/pkg/signals:go_default_library", "@com_github_golang_glog//:go_default_library", "@io_k8s_api//apps/v1:go_default_library", diff --git a/backend/src/crd/controller/viewer/main.go b/backend/src/crd/controller/viewer/main.go index 14e0f29009c..853c9917d06 100644 --- a/backend/src/crd/controller/viewer/main.go +++ b/backend/src/crd/controller/viewer/main.go @@ -25,7 +25,7 @@ import ( "github.com/kubeflow/pipelines/backend/src/crd/controller/viewer/reconciler" "github.com/kubeflow/pipelines/backend/src/crd/pkg/signals" - viewerV1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1alpha1" + viewerV1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1beta1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" @@ -57,7 +57,7 @@ func main() { log.Fatalf("Failed to build Kubernetes runtime client: %v", err) } - viewerV1alpha1.AddToScheme(scheme.Scheme) + viewerV1beta1.AddToScheme(scheme.Scheme) opts := &reconciler.Options{MaxNumViewers: *maxNumViewers} reconciler, err := reconciler.New(cli, scheme.Scheme, opts) if err != nil { @@ -68,7 +68,7 @@ func main() { // Create a controller that is in charge of Viewer types, and also responds to // changes to any deployment and services that is owned by any Viewer instance. mgr, err := builder.SimpleController(). - ForType(&viewerV1alpha1.Viewer{}). + ForType(&viewerV1beta1.Viewer{}). Owns(&appsv1.Deployment{}). Owns(&corev1.Service{}). WithConfig(cfg). diff --git a/backend/src/crd/controller/viewer/reconciler/BUILD.bazel b/backend/src/crd/controller/viewer/reconciler/BUILD.bazel index 561441047e1..80e4721ab7c 100644 --- a/backend/src/crd/controller/viewer/reconciler/BUILD.bazel +++ b/backend/src/crd/controller/viewer/reconciler/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/kubeflow/pipelines/backend/src/crd/controller/viewer/reconciler", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/viewer/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/viewer/v1beta1:go_default_library", "@com_github_golang_glog//:go_default_library", "@io_k8s_api//apps/v1:go_default_library", "@io_k8s_api//core/v1:go_default_library", @@ -27,7 +27,7 @@ go_test( srcs = ["reconciler_test.go"], embed = [":go_default_library"], deps = [ - "//backend/src/crd/pkg/apis/viewer/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/viewer/v1beta1:go_default_library", "@com_github_google_go_cmp//cmp:go_default_library", "@com_github_google_go_cmp//cmp/cmpopts:go_default_library", "@io_k8s_api//apps/v1:go_default_library", diff --git a/backend/src/crd/controller/viewer/reconciler/reconciler.go b/backend/src/crd/controller/viewer/reconciler/reconciler.go index cb300677118..282e8930f56 100644 --- a/backend/src/crd/controller/viewer/reconciler/reconciler.go +++ b/backend/src/crd/controller/viewer/reconciler/reconciler.go @@ -26,7 +26,7 @@ import ( "fmt" "github.com/golang/glog" - viewerV1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1alpha1" + viewerV1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1beta1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -71,7 +71,7 @@ func New(cli client.Client, scheme *runtime.Scheme, opts *Options) (*Reconciler, func (r *Reconciler) Reconcile(req reconcile.Request) (reconcile.Result, error) { glog.Infof("Reconcile request: %+v", req) - view := &viewerV1alpha1.Viewer{} + view := &viewerV1beta1.Viewer{} if err := r.Get(context.Background(), req.NamespacedName, view); err != nil { if errors.IsNotFound(err) { // No viewer instance, so this may be the result of a delete. @@ -84,7 +84,7 @@ func (r *Reconciler) Reconcile(req reconcile.Request) (reconcile.Result, error) glog.Infof("Got instance: %+v", view) // Ignore other viewer types for now. - if view.Spec.Type != viewerV1alpha1.ViewerTypeTensorboard { + if view.Spec.Type != viewerV1beta1.ViewerTypeTensorboard { glog.Infof("Unsupported spec type: %q", view.Spec.Type) // Return nil to indicate nothing more to do here. return reconcile.Result{}, nil @@ -158,7 +158,7 @@ func (r *Reconciler) Reconcile(req reconcile.Request) (reconcile.Result, error) return reconcile.Result{}, nil } -func setPodSpecForTensorboard(view *viewerV1alpha1.Viewer, s *corev1.PodSpec) { +func setPodSpecForTensorboard(view *viewerV1beta1.Viewer, s *corev1.PodSpec) { if len(s.Containers) == 0 { s.Containers = append(s.Containers, corev1.Container{}) } @@ -177,7 +177,7 @@ func setPodSpecForTensorboard(view *viewerV1alpha1.Viewer, s *corev1.PodSpec) { } -func deploymentFrom(view *viewerV1alpha1.Viewer) (*appsv1.Deployment, error) { +func deploymentFrom(view *viewerV1beta1.Viewer) (*appsv1.Deployment, error) { name := view.Name + "-deployment" dpl := &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ @@ -205,7 +205,7 @@ func deploymentFrom(view *viewerV1alpha1.Viewer) (*appsv1.Deployment, error) { dpl.Spec.Template.ObjectMeta.Labels["viewer"] = view.Name switch view.Spec.Type { - case viewerV1alpha1.ViewerTypeTensorboard: + case viewerV1beta1.ViewerTypeTensorboard: setPodSpecForTensorboard(view, &dpl.Spec.Template.Spec) default: return nil, fmt.Errorf("unknown viewer type: %q", view.Spec.Type) @@ -223,7 +223,7 @@ prefix: %s rewrite: %s service: %s` -func serviceFrom(v *viewerV1alpha1.Viewer, deploymentName string) *corev1.Service { +func serviceFrom(v *viewerV1beta1.Viewer, deploymentName string) *corev1.Service { name := v.Name + "-service" path := fmt.Sprintf("/%s/%s/", v.Spec.Type, v.Name) mapping := fmt.Sprintf(mappingTpl, v.Name, path, path, name) @@ -254,8 +254,8 @@ func serviceFrom(v *viewerV1alpha1.Viewer, deploymentName string) *corev1.Servic } } -func (r *Reconciler) maybeDeleteOldestViewer(t viewerV1alpha1.ViewerType) error { - list := &viewerV1alpha1.ViewerList{} +func (r *Reconciler) maybeDeleteOldestViewer(t viewerV1beta1.ViewerType) error { + list := &viewerV1beta1.ViewerList{} if err := r.Client.List(context.Background(), &client.ListOptions{}, list); err != nil { return fmt.Errorf("failed to list viewers: %v", err) diff --git a/backend/src/crd/controller/viewer/reconciler/reconciler_test.go b/backend/src/crd/controller/viewer/reconciler/reconciler_test.go index ef4ba747e26..02eb395796a 100644 --- a/backend/src/crd/controller/viewer/reconciler/reconciler_test.go +++ b/backend/src/crd/controller/viewer/reconciler/reconciler_test.go @@ -23,7 +23,7 @@ import ( "github.com/google/go-cmp/cmp" _ "github.com/google/go-cmp/cmp/cmpopts" - viewerV1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1alpha1" + viewerV1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1beta1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" @@ -39,7 +39,7 @@ import ( var viewer *Reconciler func TestMain(m *testing.M) { - viewerV1alpha1.AddToScheme(scheme.Scheme) + viewerV1beta1.AddToScheme(scheme.Scheme) os.Exit(m.Run()) } @@ -73,14 +73,14 @@ func getServices(t *testing.T, c client.Client) []*corev1.Service { return svcs } -func getViewers(t *testing.T, c client.Client) []*viewerV1alpha1.Viewer { - list := &viewerV1alpha1.ViewerList{} +func getViewers(t *testing.T, c client.Client) []*viewerV1beta1.Viewer { + list := &viewerV1beta1.ViewerList{} if err := c.List(context.Background(), &client.ListOptions{}, list); err != nil { t.Fatalf("Failed to list viewers with fake client: %v", err) } - var items []*viewerV1alpha1.Viewer + var items []*viewerV1beta1.Viewer for _, i := range list.Items { i := i items = append(items, &i) @@ -106,7 +106,7 @@ func serviceNames(svcs []*corev1.Service) []string { return ns } -func viewerNames(items []*viewerV1alpha1.Viewer) []string { +func viewerNames(items []*viewerV1beta1.Viewer) []string { var ns []string for _, s := range items { @@ -120,14 +120,14 @@ func boolRef(val bool) *bool { } func TestReconcile_EachViewerCreatesADeployment(t *testing.T) { - viewer := &viewerV1alpha1.Viewer{ + viewer := &viewerV1beta1.Viewer{ ObjectMeta: metav1.ObjectMeta{ Name: "viewer-123", Namespace: "kubeflow", }, - Spec: viewerV1alpha1.ViewerSpec{ - Type: viewerV1alpha1.ViewerTypeTensorboard, - TensorboardSpec: viewerV1alpha1.TensorboardSpec{ + Spec: viewerV1beta1.ViewerSpec{ + Type: viewerV1beta1.ViewerTypeTensorboard, + TensorboardSpec: viewerV1beta1.TensorboardSpec{ LogDir: "gs://tensorboard/logdir", }, }, @@ -150,7 +150,7 @@ func TestReconcile_EachViewerCreatesADeployment(t *testing.T) { Name: "viewer-123-deployment", Namespace: "kubeflow", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Name: "viewer-123", Kind: "Viewer", Controller: boolRef(true), @@ -192,14 +192,14 @@ func TestReconcile_EachViewerCreatesADeployment(t *testing.T) { } func TestReconcile_ViewerUsesSpecifiedVolumeMountsForDeployment(t *testing.T) { - viewer := &viewerV1alpha1.Viewer{ + viewer := &viewerV1beta1.Viewer{ ObjectMeta: metav1.ObjectMeta{ Name: "viewer-123", Namespace: "kubeflow", }, - Spec: viewerV1alpha1.ViewerSpec{ - Type: viewerV1alpha1.ViewerTypeTensorboard, - TensorboardSpec: viewerV1alpha1.TensorboardSpec{ + Spec: viewerV1beta1.ViewerSpec{ + Type: viewerV1beta1.ViewerTypeTensorboard, + TensorboardSpec: viewerV1beta1.TensorboardSpec{ LogDir: "gs://tensorboard/logdir", }, PodTemplateSpec: corev1.PodTemplateSpec{ @@ -247,7 +247,7 @@ func TestReconcile_ViewerUsesSpecifiedVolumeMountsForDeployment(t *testing.T) { Name: "viewer-123-deployment", Namespace: "kubeflow", OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Name: "viewer-123", Kind: "Viewer", Controller: boolRef(true), @@ -303,14 +303,14 @@ func TestReconcile_ViewerUsesSpecifiedVolumeMountsForDeployment(t *testing.T) { } func TestReconcile_EachViewerCreatesAService(t *testing.T) { - viewer := &viewerV1alpha1.Viewer{ + viewer := &viewerV1beta1.Viewer{ ObjectMeta: metav1.ObjectMeta{ Name: "viewer-123", Namespace: "kubeflow", }, - Spec: viewerV1alpha1.ViewerSpec{ - Type: viewerV1alpha1.ViewerTypeTensorboard, - TensorboardSpec: viewerV1alpha1.TensorboardSpec{ + Spec: viewerV1beta1.ViewerSpec{ + Type: viewerV1beta1.ViewerTypeTensorboard, + TensorboardSpec: viewerV1beta1.TensorboardSpec{ LogDir: "gs://tensorboard/logdir", }, }, @@ -341,7 +341,7 @@ func TestReconcile_EachViewerCreatesAService(t *testing.T) { "rewrite: /tensorboard/viewer-123/\n" + "service: viewer-123-service"}, OwnerReferences: []metav1.OwnerReference{{ - APIVersion: "kubeflow.org/v1alpha1", + APIVersion: "kubeflow.org/v1beta1", Kind: "Viewer", Name: "viewer-123", Controller: boolRef(true), @@ -373,14 +373,14 @@ func TestReconcile_EachViewerCreatesAService(t *testing.T) { } func TestReconcile_UnknownViewerTypesAreIgnored(t *testing.T) { - viewer := &viewerV1alpha1.Viewer{ + viewer := &viewerV1beta1.Viewer{ ObjectMeta: metav1.ObjectMeta{ Name: "viewer-123", Namespace: "kubeflow", }, - Spec: viewerV1alpha1.ViewerSpec{ + Spec: viewerV1beta1.ViewerSpec{ Type: "unknownType", - TensorboardSpec: viewerV1alpha1.TensorboardSpec{ + TensorboardSpec: viewerV1beta1.TensorboardSpec{ LogDir: "gs://tensorboard/logdir", }, }, @@ -441,16 +441,16 @@ func TestReconcile_UnknownViewerDoesNothing(t *testing.T) { } } -func makeViewer(id int) (*types.NamespacedName, *viewerV1alpha1.Viewer) { - v := &viewerV1alpha1.Viewer{ +func makeViewer(id int) (*types.NamespacedName, *viewerV1beta1.Viewer) { + v := &viewerV1beta1.Viewer{ ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("viewer-%d", id), Namespace: "kubeflow", CreationTimestamp: metav1.Time{Time: time.Unix(int64(id), 0)}, }, - Spec: viewerV1alpha1.ViewerSpec{ - Type: viewerV1alpha1.ViewerTypeTensorboard, - TensorboardSpec: viewerV1alpha1.TensorboardSpec{ + Spec: viewerV1beta1.ViewerSpec{ + Type: viewerV1beta1.ViewerTypeTensorboard, + TensorboardSpec: viewerV1beta1.TensorboardSpec{ LogDir: "gs://tensorboard/logdir", }, }, diff --git a/backend/src/crd/hack/update-codegen.sh b/backend/src/crd/hack/update-codegen.sh index b951f9f5df4..9677bb878f0 100755 --- a/backend/src/crd/hack/update-codegen.sh +++ b/backend/src/crd/hack/update-codegen.sh @@ -29,11 +29,11 @@ echo "CODEGEN_PKG is $CODEGEN_PKG" ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \ github.com/kubeflow/pipelines/backend/src/crd/pkg/client \ github.com/kubeflow/pipelines/backend/src/crd/pkg/apis \ - "scheduledworkflow:v1alpha1 viewer:v1alpha1" \ + "scheduledworkflow:v1beta1 viewer:v1beta1" \ --go-header-file ${SCRIPT_ROOT}/custom-boilerplate.go.txt ${CODEGEN_PKG}/generate-groups.sh "client,informer,lister" \ github.com/kubeflow/pipelines/backend/src/crd/pkg/client \ github.com/kubeflow/pipelines/backend/src/crd/pkg/apis \ - scheduledworkflow:v1alpha1 \ + scheduledworkflow:v1beta1 \ --go-header-file ${SCRIPT_ROOT}/custom-boilerplate.go.txt diff --git a/backend/src/crd/install/manifests/scheduledworkflow-crd.yaml b/backend/src/crd/install/manifests/scheduledworkflow-crd.yaml index 95dc6d0fa99..b6bfbb760c7 100644 --- a/backend/src/crd/install/manifests/scheduledworkflow-crd.yaml +++ b/backend/src/crd/install/manifests/scheduledworkflow-crd.yaml @@ -18,7 +18,7 @@ metadata: name: scheduledworkflows.kubeflow.org spec: group: kubeflow.org - version: v1alpha1 + version: v1beta1 scope: Namespaced names: kind: "ScheduledWorkflow" diff --git a/backend/src/crd/install/manifests/viewer-crd.yaml b/backend/src/crd/install/manifests/viewer-crd.yaml index 18316a281a5..0e60e6f654f 100644 --- a/backend/src/crd/install/manifests/viewer-crd.yaml +++ b/backend/src/crd/install/manifests/viewer-crd.yaml @@ -18,7 +18,7 @@ metadata: name: viewers.kubeflow.org spec: group: kubeflow.org - version: v1alpha1 + version: v1beta1 scope: Namespaced names: kind: "Viewer" diff --git a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/BUILD.bazel b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/BUILD.bazel similarity index 95% rename from backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/BUILD.bazel rename to backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/BUILD.bazel index 97de7ac85ca..d68ec8d19bd 100644 --- a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/BUILD.bazel +++ b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1", + importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1", visibility = ["//visibility:public"], deps = [ "//backend/src/crd/pkg/apis/scheduledworkflow:go_default_library", diff --git a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/doc.go b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/doc.go similarity index 90% rename from backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/doc.go rename to backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/doc.go index adc3dec2983..f309c047ba9 100644 --- a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/doc.go +++ b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/doc.go @@ -14,6 +14,6 @@ // +k8s:deepcopy-gen=package -// Package v1alpha1 is the v1alpha1 version of the API. +// Package v1beta1 is the v1beta1 version of the API. // +groupName=scheduledworkflow.kubeflow.org -package v1alpha1 +package v1beta1 diff --git a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/register.go b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/register.go similarity index 97% rename from backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/register.go rename to backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/register.go index ca91e41657a..0457c11c2a4 100644 --- a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/register.go +++ b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/register.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,7 +23,7 @@ import ( ) // SchemeGroupVersion is group version used to register these objects -var SchemeGroupVersion = schema.GroupVersion{Group: controller.GroupName, Version: "v1alpha1"} +var SchemeGroupVersion = schema.GroupVersion{Group: controller.GroupName, Version: "v1beta1"} // Kind takes an unqualified kind and returns back a Group qualified GroupKind func Kind(kind string) schema.GroupKind { diff --git a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/types.go b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/types.go similarity index 99% rename from backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/types.go rename to backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/types.go index 1966ce65534..e8963341d8d 100644 --- a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/types.go +++ b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/types.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package v1alpha1 +package v1beta1 import ( "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" diff --git a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/zz_generated.deepcopy.go b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/zz_generated.deepcopy.go rename to backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/zz_generated.deepcopy.go index 82b608ea8d6..8aba2abcf97 100644 --- a/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1/zz_generated.deepcopy.go +++ b/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1/zz_generated.deepcopy.go @@ -15,7 +15,7 @@ // limitations under the License. // Code generated by deepcopy-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/backend/src/crd/pkg/apis/viewer/v1alpha1/BUILD.bazel b/backend/src/crd/pkg/apis/viewer/v1beta1/BUILD.bazel similarity index 96% rename from backend/src/crd/pkg/apis/viewer/v1alpha1/BUILD.bazel rename to backend/src/crd/pkg/apis/viewer/v1beta1/BUILD.bazel index 84e3c83fe74..ac95c7308ff 100644 --- a/backend/src/crd/pkg/apis/viewer/v1alpha1/BUILD.bazel +++ b/backend/src/crd/pkg/apis/viewer/v1beta1/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1alpha1", + importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer/v1beta1", visibility = ["//visibility:public"], deps = [ "//backend/src/crd/pkg/apis/viewer:go_default_library", diff --git a/backend/src/crd/pkg/apis/viewer/v1alpha1/doc.go b/backend/src/crd/pkg/apis/viewer/v1beta1/doc.go similarity index 89% rename from backend/src/crd/pkg/apis/viewer/v1alpha1/doc.go rename to backend/src/crd/pkg/apis/viewer/v1beta1/doc.go index 78da3d6959f..5a5de606fee 100644 --- a/backend/src/crd/pkg/apis/viewer/v1alpha1/doc.go +++ b/backend/src/crd/pkg/apis/viewer/v1beta1/doc.go @@ -14,6 +14,6 @@ // +k8s:deepcopy-gen=package -// Package v1alpha1 is the v1alpha1 version of the API. +// Package v1beta1 is the v1beta1 version of the API. // +groupName=viewer.kubeflow.org -package v1alpha1 +package v1beta1 diff --git a/backend/src/crd/pkg/apis/viewer/v1alpha1/register.go b/backend/src/crd/pkg/apis/viewer/v1beta1/register.go similarity index 97% rename from backend/src/crd/pkg/apis/viewer/v1alpha1/register.go rename to backend/src/crd/pkg/apis/viewer/v1beta1/register.go index c896a916ffd..5567863b131 100644 --- a/backend/src/crd/pkg/apis/viewer/v1alpha1/register.go +++ b/backend/src/crd/pkg/apis/viewer/v1beta1/register.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package v1alpha1 +package v1beta1 import ( "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/viewer" @@ -22,7 +22,7 @@ import ( ) // SchemeGroupVersion is group version used to register these objects -var SchemeGroupVersion = schema.GroupVersion{Group: viewer.GroupName, Version: "v1alpha1"} +var SchemeGroupVersion = schema.GroupVersion{Group: viewer.GroupName, Version: "v1beta1"} // Kind takes an unqualified kind and returns back a Group qualified GroupKind func Kind(kind string) schema.GroupKind { diff --git a/backend/src/crd/pkg/apis/viewer/v1alpha1/types.go b/backend/src/crd/pkg/apis/viewer/v1beta1/types.go similarity index 99% rename from backend/src/crd/pkg/apis/viewer/v1alpha1/types.go rename to backend/src/crd/pkg/apis/viewer/v1beta1/types.go index 3608f2312a8..a9c7ae8b04f 100644 --- a/backend/src/crd/pkg/apis/viewer/v1alpha1/types.go +++ b/backend/src/crd/pkg/apis/viewer/v1beta1/types.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package v1alpha1 +package v1beta1 import ( v1 "k8s.io/api/core/v1" diff --git a/backend/src/crd/pkg/apis/viewer/v1alpha1/zz_generated.deepcopy.go b/backend/src/crd/pkg/apis/viewer/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from backend/src/crd/pkg/apis/viewer/v1alpha1/zz_generated.deepcopy.go rename to backend/src/crd/pkg/apis/viewer/v1beta1/zz_generated.deepcopy.go index be5c4d6a1cf..6a92d39ea1e 100644 --- a/backend/src/crd/pkg/apis/viewer/v1alpha1/zz_generated.deepcopy.go +++ b/backend/src/crd/pkg/apis/viewer/v1beta1/zz_generated.deepcopy.go @@ -15,7 +15,7 @@ // limitations under the License. // Code generated by deepcopy-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/backend/src/crd/pkg/client/clientset/versioned/BUILD.bazel b/backend/src/crd/pkg/client/clientset/versioned/BUILD.bazel index 0b74f5bd3ca..825e52f37cb 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/BUILD.bazel +++ b/backend/src/crd/pkg/client/clientset/versioned/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1:go_default_library", "@io_k8s_client_go//discovery:go_default_library", "@io_k8s_client_go//rest:go_default_library", "@io_k8s_client_go//util/flowcontrol:go_default_library", diff --git a/backend/src/crd/pkg/client/clientset/versioned/clientset.go b/backend/src/crd/pkg/client/clientset/versioned/clientset.go index d93eeae20fd..ffd3db95ab2 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/clientset.go +++ b/backend/src/crd/pkg/client/clientset/versioned/clientset.go @@ -16,7 +16,7 @@ package versioned import ( - scheduledworkflowv1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1" + scheduledworkflowv1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -24,27 +24,27 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - ScheduledworkflowV1alpha1() scheduledworkflowv1alpha1.ScheduledworkflowV1alpha1Interface + ScheduledworkflowV1beta1() scheduledworkflowv1beta1.ScheduledworkflowV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Scheduledworkflow() scheduledworkflowv1alpha1.ScheduledworkflowV1alpha1Interface + Scheduledworkflow() scheduledworkflowv1beta1.ScheduledworkflowV1beta1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - scheduledworkflowV1alpha1 *scheduledworkflowv1alpha1.ScheduledworkflowV1alpha1Client + scheduledworkflowV1beta1 *scheduledworkflowv1beta1.ScheduledworkflowV1beta1Client } -// ScheduledworkflowV1alpha1 retrieves the ScheduledworkflowV1alpha1Client -func (c *Clientset) ScheduledworkflowV1alpha1() scheduledworkflowv1alpha1.ScheduledworkflowV1alpha1Interface { - return c.scheduledworkflowV1alpha1 +// ScheduledworkflowV1beta1 retrieves the ScheduledworkflowV1beta1Client +func (c *Clientset) ScheduledworkflowV1beta1() scheduledworkflowv1beta1.ScheduledworkflowV1beta1Interface { + return c.scheduledworkflowV1beta1 } // Deprecated: Scheduledworkflow retrieves the default version of ScheduledworkflowClient. // Please explicitly pick a version. -func (c *Clientset) Scheduledworkflow() scheduledworkflowv1alpha1.ScheduledworkflowV1alpha1Interface { - return c.scheduledworkflowV1alpha1 +func (c *Clientset) Scheduledworkflow() scheduledworkflowv1beta1.ScheduledworkflowV1beta1Interface { + return c.scheduledworkflowV1beta1 } // Discovery retrieves the DiscoveryClient @@ -63,7 +63,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.scheduledworkflowV1alpha1, err = scheduledworkflowv1alpha1.NewForConfig(&configShallowCopy) + cs.scheduledworkflowV1beta1, err = scheduledworkflowv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -79,7 +79,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.scheduledworkflowV1alpha1 = scheduledworkflowv1alpha1.NewForConfigOrDie(c) + cs.scheduledworkflowV1beta1 = scheduledworkflowv1beta1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -88,7 +88,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.scheduledworkflowV1alpha1 = scheduledworkflowv1alpha1.New(c) + cs.scheduledworkflowV1beta1 = scheduledworkflowv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/backend/src/crd/pkg/client/clientset/versioned/fake/BUILD.bazel b/backend/src/crd/pkg/client/clientset/versioned/fake/BUILD.bazel index 5b5da88195e..c471d53c78a 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/fake/BUILD.bazel +++ b/backend/src/crd/pkg/client/clientset/versioned/fake/BUILD.bazel @@ -10,10 +10,10 @@ go_library( importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/fake", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "//backend/src/crd/pkg/client/clientset/versioned:go_default_library", - "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1:go_default_library", - "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake:go_default_library", + "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1:go_default_library", + "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/backend/src/crd/pkg/client/clientset/versioned/fake/clientset_generated.go b/backend/src/crd/pkg/client/clientset/versioned/fake/clientset_generated.go index e0922750a99..95a9297efbb 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/backend/src/crd/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -17,8 +17,8 @@ package fake import ( clientset "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned" - scheduledworkflowv1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1" - fakescheduledworkflowv1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake" + scheduledworkflowv1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1" + fakescheduledworkflowv1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -68,12 +68,12 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} -// ScheduledworkflowV1alpha1 retrieves the ScheduledworkflowV1alpha1Client -func (c *Clientset) ScheduledworkflowV1alpha1() scheduledworkflowv1alpha1.ScheduledworkflowV1alpha1Interface { - return &fakescheduledworkflowv1alpha1.FakeScheduledworkflowV1alpha1{Fake: &c.Fake} +// ScheduledworkflowV1beta1 retrieves the ScheduledworkflowV1beta1Client +func (c *Clientset) ScheduledworkflowV1beta1() scheduledworkflowv1beta1.ScheduledworkflowV1beta1Interface { + return &fakescheduledworkflowv1beta1.FakeScheduledworkflowV1beta1{Fake: &c.Fake} } -// Scheduledworkflow retrieves the ScheduledworkflowV1alpha1Client -func (c *Clientset) Scheduledworkflow() scheduledworkflowv1alpha1.ScheduledworkflowV1alpha1Interface { - return &fakescheduledworkflowv1alpha1.FakeScheduledworkflowV1alpha1{Fake: &c.Fake} +// Scheduledworkflow retrieves the ScheduledworkflowV1beta1Client +func (c *Clientset) Scheduledworkflow() scheduledworkflowv1beta1.ScheduledworkflowV1beta1Interface { + return &fakescheduledworkflowv1beta1.FakeScheduledworkflowV1beta1{Fake: &c.Fake} } diff --git a/backend/src/crd/pkg/client/clientset/versioned/fake/register.go b/backend/src/crd/pkg/client/clientset/versioned/fake/register.go index 8c80d756971..1c1d9fa804e 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/fake/register.go +++ b/backend/src/crd/pkg/client/clientset/versioned/fake/register.go @@ -16,7 +16,7 @@ package fake import ( - scheduledworkflowv1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + scheduledworkflowv1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -47,5 +47,5 @@ func init() { // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. func AddToScheme(scheme *runtime.Scheme) { - scheduledworkflowv1alpha1.AddToScheme(scheme) + scheduledworkflowv1beta1.AddToScheme(scheme) } diff --git a/backend/src/crd/pkg/client/clientset/versioned/scheme/BUILD.bazel b/backend/src/crd/pkg/client/clientset/versioned/scheme/BUILD.bazel index 7e1b51e4f1e..0adab2317a3 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/scheme/BUILD.bazel +++ b/backend/src/crd/pkg/client/clientset/versioned/scheme/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/scheme", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/backend/src/crd/pkg/client/clientset/versioned/scheme/register.go b/backend/src/crd/pkg/client/clientset/versioned/scheme/register.go index 83714712d4c..137adac8269 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/scheme/register.go +++ b/backend/src/crd/pkg/client/clientset/versioned/scheme/register.go @@ -16,7 +16,7 @@ package scheme import ( - scheduledworkflowv1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + scheduledworkflowv1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -47,5 +47,5 @@ func init() { // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. func AddToScheme(scheme *runtime.Scheme) { - scheduledworkflowv1alpha1.AddToScheme(scheme) + scheduledworkflowv1beta1.AddToScheme(scheme) } diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/BUILD.bazel b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/BUILD.bazel similarity index 83% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/BUILD.bazel rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/BUILD.bazel index 58e4bdd2273..930612a1ad9 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/BUILD.bazel +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/BUILD.bazel @@ -8,10 +8,10 @@ go_library( "scheduledworkflow.go", "scheduledworkflow_client.go", ], - importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1", + importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "//backend/src/crd/pkg/client/clientset/versioned/scheme:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime/serializer:go_default_library", diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/doc.go b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/doc.go similarity index 97% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/doc.go rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/doc.go index efff19a8098..6e8a6d7b007 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/doc.go +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/doc.go @@ -14,4 +14,4 @@ // Code generated by client-gen. DO NOT EDIT. // This package has the automatically generated typed clients. -package v1alpha1 +package v1beta1 diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/BUILD.bazel b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/BUILD.bazel similarity index 80% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/BUILD.bazel rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/BUILD.bazel index 65de675dd60..73b72d778e5 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/BUILD.bazel +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/BUILD.bazel @@ -7,11 +7,11 @@ go_library( "fake_scheduledworkflow.go", "fake_scheduledworkflow_client.go", ], - importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake", + importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", - "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", + "//backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/labels:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/doc.go b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/doc.go similarity index 100% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/doc.go rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/doc.go diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/fake_scheduledworkflow.go b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow.go similarity index 70% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/fake_scheduledworkflow.go rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow.go index 755e6f1e8f1..efd6d6ee74a 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/fake_scheduledworkflow.go +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow.go @@ -16,7 +16,7 @@ package fake import ( - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -27,29 +27,29 @@ import ( // FakeScheduledWorkflows implements ScheduledWorkflowInterface type FakeScheduledWorkflows struct { - Fake *FakeScheduledworkflowV1alpha1 + Fake *FakeScheduledworkflowV1beta1 ns string } -var scheduledworkflowsResource = schema.GroupVersionResource{Group: "scheduledworkflow.kubeflow.org", Version: "v1alpha1", Resource: "scheduledworkflows"} +var scheduledworkflowsResource = schema.GroupVersionResource{Group: "scheduledworkflow.kubeflow.org", Version: "v1beta1", Resource: "scheduledworkflows"} -var scheduledworkflowsKind = schema.GroupVersionKind{Group: "scheduledworkflow.kubeflow.org", Version: "v1alpha1", Kind: "ScheduledWorkflow"} +var scheduledworkflowsKind = schema.GroupVersionKind{Group: "scheduledworkflow.kubeflow.org", Version: "v1beta1", Kind: "ScheduledWorkflow"} // Get takes name of the scheduledWorkflow, and returns the corresponding scheduledWorkflow object, and an error if there is any. -func (c *FakeScheduledWorkflows) Get(name string, options v1.GetOptions) (result *v1alpha1.ScheduledWorkflow, err error) { +func (c *FakeScheduledWorkflows) Get(name string, options v1.GetOptions) (result *v1beta1.ScheduledWorkflow, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(scheduledworkflowsResource, c.ns, name), &v1alpha1.ScheduledWorkflow{}) + Invokes(testing.NewGetAction(scheduledworkflowsResource, c.ns, name), &v1beta1.ScheduledWorkflow{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.ScheduledWorkflow), err + return obj.(*v1beta1.ScheduledWorkflow), err } // List takes label and field selectors, and returns the list of ScheduledWorkflows that match those selectors. -func (c *FakeScheduledWorkflows) List(opts v1.ListOptions) (result *v1alpha1.ScheduledWorkflowList, err error) { +func (c *FakeScheduledWorkflows) List(opts v1.ListOptions) (result *v1beta1.ScheduledWorkflowList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(scheduledworkflowsResource, scheduledworkflowsKind, c.ns, opts), &v1alpha1.ScheduledWorkflowList{}) + Invokes(testing.NewListAction(scheduledworkflowsResource, scheduledworkflowsKind, c.ns, opts), &v1beta1.ScheduledWorkflowList{}) if obj == nil { return nil, err @@ -59,8 +59,8 @@ func (c *FakeScheduledWorkflows) List(opts v1.ListOptions) (result *v1alpha1.Sch if label == nil { label = labels.Everything() } - list := &v1alpha1.ScheduledWorkflowList{ListMeta: obj.(*v1alpha1.ScheduledWorkflowList).ListMeta} - for _, item := range obj.(*v1alpha1.ScheduledWorkflowList).Items { + list := &v1beta1.ScheduledWorkflowList{ListMeta: obj.(*v1beta1.ScheduledWorkflowList).ListMeta} + for _, item := range obj.(*v1beta1.ScheduledWorkflowList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -76,31 +76,31 @@ func (c *FakeScheduledWorkflows) Watch(opts v1.ListOptions) (watch.Interface, er } // Create takes the representation of a scheduledWorkflow and creates it. Returns the server's representation of the scheduledWorkflow, and an error, if there is any. -func (c *FakeScheduledWorkflows) Create(scheduledWorkflow *v1alpha1.ScheduledWorkflow) (result *v1alpha1.ScheduledWorkflow, err error) { +func (c *FakeScheduledWorkflows) Create(scheduledWorkflow *v1beta1.ScheduledWorkflow) (result *v1beta1.ScheduledWorkflow, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(scheduledworkflowsResource, c.ns, scheduledWorkflow), &v1alpha1.ScheduledWorkflow{}) + Invokes(testing.NewCreateAction(scheduledworkflowsResource, c.ns, scheduledWorkflow), &v1beta1.ScheduledWorkflow{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.ScheduledWorkflow), err + return obj.(*v1beta1.ScheduledWorkflow), err } // Update takes the representation of a scheduledWorkflow and updates it. Returns the server's representation of the scheduledWorkflow, and an error, if there is any. -func (c *FakeScheduledWorkflows) Update(scheduledWorkflow *v1alpha1.ScheduledWorkflow) (result *v1alpha1.ScheduledWorkflow, err error) { +func (c *FakeScheduledWorkflows) Update(scheduledWorkflow *v1beta1.ScheduledWorkflow) (result *v1beta1.ScheduledWorkflow, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(scheduledworkflowsResource, c.ns, scheduledWorkflow), &v1alpha1.ScheduledWorkflow{}) + Invokes(testing.NewUpdateAction(scheduledworkflowsResource, c.ns, scheduledWorkflow), &v1beta1.ScheduledWorkflow{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.ScheduledWorkflow), err + return obj.(*v1beta1.ScheduledWorkflow), err } // Delete takes name of the scheduledWorkflow and deletes it. Returns an error if one occurs. func (c *FakeScheduledWorkflows) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(scheduledworkflowsResource, c.ns, name), &v1alpha1.ScheduledWorkflow{}) + Invokes(testing.NewDeleteAction(scheduledworkflowsResource, c.ns, name), &v1beta1.ScheduledWorkflow{}) return err } @@ -109,17 +109,17 @@ func (c *FakeScheduledWorkflows) Delete(name string, options *v1.DeleteOptions) func (c *FakeScheduledWorkflows) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(scheduledworkflowsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &v1alpha1.ScheduledWorkflowList{}) + _, err := c.Fake.Invokes(action, &v1beta1.ScheduledWorkflowList{}) return err } // Patch applies the patch and returns the patched scheduledWorkflow. -func (c *FakeScheduledWorkflows) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ScheduledWorkflow, err error) { +func (c *FakeScheduledWorkflows) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ScheduledWorkflow, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(scheduledworkflowsResource, c.ns, name, data, subresources...), &v1alpha1.ScheduledWorkflow{}) + Invokes(testing.NewPatchSubresourceAction(scheduledworkflowsResource, c.ns, name, data, subresources...), &v1beta1.ScheduledWorkflow{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.ScheduledWorkflow), err + return obj.(*v1beta1.ScheduledWorkflow), err } diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/fake_scheduledworkflow_client.go b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow_client.go similarity index 72% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/fake_scheduledworkflow_client.go rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow_client.go index 2a2d4576f4e..dc47dde59fb 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/fake/fake_scheduledworkflow_client.go +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow_client.go @@ -16,22 +16,22 @@ package fake import ( - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) -type FakeScheduledworkflowV1alpha1 struct { +type FakeScheduledworkflowV1beta1 struct { *testing.Fake } -func (c *FakeScheduledworkflowV1alpha1) ScheduledWorkflows(namespace string) v1alpha1.ScheduledWorkflowInterface { +func (c *FakeScheduledworkflowV1beta1) ScheduledWorkflows(namespace string) v1beta1.ScheduledWorkflowInterface { return &FakeScheduledWorkflows{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeScheduledworkflowV1alpha1) RESTClient() rest.Interface { +func (c *FakeScheduledworkflowV1beta1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/generated_expansion.go b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/generated_expansion.go similarity index 97% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/generated_expansion.go rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/generated_expansion.go index 0525a445bdf..d0f7d23a595 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/generated_expansion.go +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/generated_expansion.go @@ -13,6 +13,6 @@ // limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 type ScheduledWorkflowExpansion interface{} diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/scheduledworkflow.go b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow.go similarity index 78% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/scheduledworkflow.go rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow.go index 2a588311188..ead3469645d 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/scheduledworkflow.go +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow.go @@ -13,10 +13,10 @@ // limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" scheme "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -32,14 +32,14 @@ type ScheduledWorkflowsGetter interface { // ScheduledWorkflowInterface has methods to work with ScheduledWorkflow resources. type ScheduledWorkflowInterface interface { - Create(*v1alpha1.ScheduledWorkflow) (*v1alpha1.ScheduledWorkflow, error) - Update(*v1alpha1.ScheduledWorkflow) (*v1alpha1.ScheduledWorkflow, error) + Create(*v1beta1.ScheduledWorkflow) (*v1beta1.ScheduledWorkflow, error) + Update(*v1beta1.ScheduledWorkflow) (*v1beta1.ScheduledWorkflow, error) Delete(name string, options *v1.DeleteOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error - Get(name string, options v1.GetOptions) (*v1alpha1.ScheduledWorkflow, error) - List(opts v1.ListOptions) (*v1alpha1.ScheduledWorkflowList, error) + Get(name string, options v1.GetOptions) (*v1beta1.ScheduledWorkflow, error) + List(opts v1.ListOptions) (*v1beta1.ScheduledWorkflowList, error) Watch(opts v1.ListOptions) (watch.Interface, error) - Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ScheduledWorkflow, err error) + Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ScheduledWorkflow, err error) ScheduledWorkflowExpansion } @@ -50,7 +50,7 @@ type scheduledWorkflows struct { } // newScheduledWorkflows returns a ScheduledWorkflows -func newScheduledWorkflows(c *ScheduledworkflowV1alpha1Client, namespace string) *scheduledWorkflows { +func newScheduledWorkflows(c *ScheduledworkflowV1beta1Client, namespace string) *scheduledWorkflows { return &scheduledWorkflows{ client: c.RESTClient(), ns: namespace, @@ -58,8 +58,8 @@ func newScheduledWorkflows(c *ScheduledworkflowV1alpha1Client, namespace string) } // Get takes name of the scheduledWorkflow, and returns the corresponding scheduledWorkflow object, and an error if there is any. -func (c *scheduledWorkflows) Get(name string, options v1.GetOptions) (result *v1alpha1.ScheduledWorkflow, err error) { - result = &v1alpha1.ScheduledWorkflow{} +func (c *scheduledWorkflows) Get(name string, options v1.GetOptions) (result *v1beta1.ScheduledWorkflow, err error) { + result = &v1beta1.ScheduledWorkflow{} err = c.client.Get(). Namespace(c.ns). Resource("scheduledworkflows"). @@ -71,8 +71,8 @@ func (c *scheduledWorkflows) Get(name string, options v1.GetOptions) (result *v1 } // List takes label and field selectors, and returns the list of ScheduledWorkflows that match those selectors. -func (c *scheduledWorkflows) List(opts v1.ListOptions) (result *v1alpha1.ScheduledWorkflowList, err error) { - result = &v1alpha1.ScheduledWorkflowList{} +func (c *scheduledWorkflows) List(opts v1.ListOptions) (result *v1beta1.ScheduledWorkflowList, err error) { + result = &v1beta1.ScheduledWorkflowList{} err = c.client.Get(). Namespace(c.ns). Resource("scheduledworkflows"). @@ -93,8 +93,8 @@ func (c *scheduledWorkflows) Watch(opts v1.ListOptions) (watch.Interface, error) } // Create takes the representation of a scheduledWorkflow and creates it. Returns the server's representation of the scheduledWorkflow, and an error, if there is any. -func (c *scheduledWorkflows) Create(scheduledWorkflow *v1alpha1.ScheduledWorkflow) (result *v1alpha1.ScheduledWorkflow, err error) { - result = &v1alpha1.ScheduledWorkflow{} +func (c *scheduledWorkflows) Create(scheduledWorkflow *v1beta1.ScheduledWorkflow) (result *v1beta1.ScheduledWorkflow, err error) { + result = &v1beta1.ScheduledWorkflow{} err = c.client.Post(). Namespace(c.ns). Resource("scheduledworkflows"). @@ -105,8 +105,8 @@ func (c *scheduledWorkflows) Create(scheduledWorkflow *v1alpha1.ScheduledWorkflo } // Update takes the representation of a scheduledWorkflow and updates it. Returns the server's representation of the scheduledWorkflow, and an error, if there is any. -func (c *scheduledWorkflows) Update(scheduledWorkflow *v1alpha1.ScheduledWorkflow) (result *v1alpha1.ScheduledWorkflow, err error) { - result = &v1alpha1.ScheduledWorkflow{} +func (c *scheduledWorkflows) Update(scheduledWorkflow *v1beta1.ScheduledWorkflow) (result *v1beta1.ScheduledWorkflow, err error) { + result = &v1beta1.ScheduledWorkflow{} err = c.client.Put(). Namespace(c.ns). Resource("scheduledworkflows"). @@ -140,8 +140,8 @@ func (c *scheduledWorkflows) DeleteCollection(options *v1.DeleteOptions, listOpt } // Patch applies the patch and returns the patched scheduledWorkflow. -func (c *scheduledWorkflows) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ScheduledWorkflow, err error) { - result = &v1alpha1.ScheduledWorkflow{} +func (c *scheduledWorkflows) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.ScheduledWorkflow, err error) { + result = &v1beta1.ScheduledWorkflow{} err = c.client.Patch(pt). Namespace(c.ns). Resource("scheduledworkflows"). diff --git a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/scheduledworkflow_client.go b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow_client.go similarity index 60% rename from backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/scheduledworkflow_client.go rename to backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow_client.go index 1c2658feb98..8091b0941a7 100644 --- a/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1alpha1/scheduledworkflow_client.go +++ b/backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow_client.go @@ -13,31 +13,31 @@ // limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) -type ScheduledworkflowV1alpha1Interface interface { +type ScheduledworkflowV1beta1Interface interface { RESTClient() rest.Interface ScheduledWorkflowsGetter } -// ScheduledworkflowV1alpha1Client is used to interact with features provided by the scheduledworkflow.kubeflow.org group. -type ScheduledworkflowV1alpha1Client struct { +// ScheduledworkflowV1beta1Client is used to interact with features provided by the scheduledworkflow.kubeflow.org group. +type ScheduledworkflowV1beta1Client struct { restClient rest.Interface } -func (c *ScheduledworkflowV1alpha1Client) ScheduledWorkflows(namespace string) ScheduledWorkflowInterface { +func (c *ScheduledworkflowV1beta1Client) ScheduledWorkflows(namespace string) ScheduledWorkflowInterface { return newScheduledWorkflows(c, namespace) } -// NewForConfig creates a new ScheduledworkflowV1alpha1Client for the given config. -func NewForConfig(c *rest.Config) (*ScheduledworkflowV1alpha1Client, error) { +// NewForConfig creates a new ScheduledworkflowV1beta1Client for the given config. +func NewForConfig(c *rest.Config) (*ScheduledworkflowV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -46,12 +46,12 @@ func NewForConfig(c *rest.Config) (*ScheduledworkflowV1alpha1Client, error) { if err != nil { return nil, err } - return &ScheduledworkflowV1alpha1Client{client}, nil + return &ScheduledworkflowV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new ScheduledworkflowV1alpha1Client for the given config and +// NewForConfigOrDie creates a new ScheduledworkflowV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *ScheduledworkflowV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *ScheduledworkflowV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -59,13 +59,13 @@ func NewForConfigOrDie(c *rest.Config) *ScheduledworkflowV1alpha1Client { return client } -// New creates a new ScheduledworkflowV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *ScheduledworkflowV1alpha1Client { - return &ScheduledworkflowV1alpha1Client{c} +// New creates a new ScheduledworkflowV1beta1Client for the given RESTClient. +func New(c rest.Interface) *ScheduledworkflowV1beta1Client { + return &ScheduledworkflowV1beta1Client{c} } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := v1beta1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} @@ -79,7 +79,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ScheduledworkflowV1alpha1Client) RESTClient() rest.Interface { +func (c *ScheduledworkflowV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/backend/src/crd/pkg/client/informers/externalversions/BUILD.bazel b/backend/src/crd/pkg/client/informers/externalversions/BUILD.bazel index 42d55552712..9c5f132d5b9 100644 --- a/backend/src/crd/pkg/client/informers/externalversions/BUILD.bazel +++ b/backend/src/crd/pkg/client/informers/externalversions/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "//backend/src/crd/pkg/client/clientset/versioned:go_default_library", "//backend/src/crd/pkg/client/informers/externalversions/internalinterfaces:go_default_library", "//backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow:go_default_library", diff --git a/backend/src/crd/pkg/client/informers/externalversions/generic.go b/backend/src/crd/pkg/client/informers/externalversions/generic.go index f0694681bd7..a91974425ff 100644 --- a/backend/src/crd/pkg/client/informers/externalversions/generic.go +++ b/backend/src/crd/pkg/client/informers/externalversions/generic.go @@ -18,7 +18,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) @@ -49,9 +49,9 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=scheduledworkflow.kubeflow.org, Version=v1alpha1 - case v1alpha1.SchemeGroupVersion.WithResource("scheduledworkflows"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Scheduledworkflow().V1alpha1().ScheduledWorkflows().Informer()}, nil + // Group=scheduledworkflow.kubeflow.org, Version=v1beta1 + case v1beta1.SchemeGroupVersion.WithResource("scheduledworkflows"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Scheduledworkflow().V1beta1().ScheduledWorkflows().Informer()}, nil } diff --git a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/BUILD.bazel b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/BUILD.bazel index 2ef9aea09ea..d800701a47a 100644 --- a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/BUILD.bazel +++ b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/BUILD.bazel @@ -7,6 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//backend/src/crd/pkg/client/informers/externalversions/internalinterfaces:go_default_library", - "//backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1:go_default_library", ], ) diff --git a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/interface.go b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/interface.go index 837c9c43f39..a212d6351e2 100644 --- a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/interface.go +++ b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/interface.go @@ -17,13 +17,13 @@ package scheduledworkflow import ( internalinterfaces "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1" ) // Interface provides access to each of this group's versions. type Interface interface { - // V1alpha1 provides access to shared informers for resources in V1alpha1. - V1alpha1() v1alpha1.Interface + // V1beta1 provides access to shared informers for resources in V1beta1. + V1beta1() v1beta1.Interface } type group struct { @@ -37,7 +37,7 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } -// V1alpha1 returns a new v1alpha1.Interface. -func (g *group) V1alpha1() v1alpha1.Interface { - return v1alpha1.New(g.factory, g.namespace, g.tweakListOptions) +// V1beta1 returns a new v1beta1.Interface. +func (g *group) V1beta1() v1beta1.Interface { + return v1beta1.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/BUILD.bazel b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/BUILD.bazel similarity index 81% rename from backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/BUILD.bazel rename to backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/BUILD.bazel index a79b251e5ec..aca40e9a467 100644 --- a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/BUILD.bazel +++ b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/BUILD.bazel @@ -6,13 +6,13 @@ go_library( "interface.go", "scheduledworkflow.go", ], - importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1", + importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "//backend/src/crd/pkg/client/clientset/versioned:go_default_library", "//backend/src/crd/pkg/client/informers/externalversions/internalinterfaces:go_default_library", - "//backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/watch:go_default_library", diff --git a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/interface.go b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/interface.go similarity index 98% rename from backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/interface.go rename to backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/interface.go index fd5aaa186a8..577de47a1e4 100644 --- a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/interface.go +++ b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/interface.go @@ -13,7 +13,7 @@ // limitations under the License. // Code generated by informer-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( internalinterfaces "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/internalinterfaces" diff --git a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/scheduledworkflow.go b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/scheduledworkflow.go similarity index 80% rename from backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/scheduledworkflow.go rename to backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/scheduledworkflow.go index a470ce1a78f..cc74fc7b35c 100644 --- a/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1alpha1/scheduledworkflow.go +++ b/backend/src/crd/pkg/client/informers/externalversions/scheduledworkflow/v1beta1/scheduledworkflow.go @@ -13,15 +13,15 @@ // limitations under the License. // Code generated by informer-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( time "time" - scheduledworkflowv1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + scheduledworkflowv1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" versioned "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/clientset/versioned" internalinterfaces "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -32,7 +32,7 @@ import ( // ScheduledWorkflows. type ScheduledWorkflowInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha1.ScheduledWorkflowLister + Lister() v1beta1.ScheduledWorkflowLister } type scheduledWorkflowInformer struct { @@ -58,16 +58,16 @@ func NewFilteredScheduledWorkflowInformer(client versioned.Interface, namespace if tweakListOptions != nil { tweakListOptions(&options) } - return client.ScheduledworkflowV1alpha1().ScheduledWorkflows(namespace).List(options) + return client.ScheduledworkflowV1beta1().ScheduledWorkflows(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.ScheduledworkflowV1alpha1().ScheduledWorkflows(namespace).Watch(options) + return client.ScheduledworkflowV1beta1().ScheduledWorkflows(namespace).Watch(options) }, }, - &scheduledworkflowv1alpha1.ScheduledWorkflow{}, + &scheduledworkflowv1beta1.ScheduledWorkflow{}, resyncPeriod, indexers, ) @@ -78,9 +78,9 @@ func (f *scheduledWorkflowInformer) defaultInformer(client versioned.Interface, } func (f *scheduledWorkflowInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&scheduledworkflowv1alpha1.ScheduledWorkflow{}, f.defaultInformer) + return f.factory.InformerFor(&scheduledworkflowv1beta1.ScheduledWorkflow{}, f.defaultInformer) } -func (f *scheduledWorkflowInformer) Lister() v1alpha1.ScheduledWorkflowLister { - return v1alpha1.NewScheduledWorkflowLister(f.Informer().GetIndexer()) +func (f *scheduledWorkflowInformer) Lister() v1beta1.ScheduledWorkflowLister { + return v1beta1.NewScheduledWorkflowLister(f.Informer().GetIndexer()) } diff --git a/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/BUILD.bazel b/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/BUILD.bazel similarity index 79% rename from backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/BUILD.bazel rename to backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/BUILD.bazel index 1ba8183fa3e..1a07658dd89 100644 --- a/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/BUILD.bazel +++ b/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/BUILD.bazel @@ -6,10 +6,10 @@ go_library( "expansion_generated.go", "scheduledworkflow.go", ], - importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1", + importpath = "github.com/kubeflow/pipelines/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1", visibility = ["//visibility:public"], deps = [ - "//backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1:go_default_library", + "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@io_k8s_apimachinery//pkg/api/errors:go_default_library", "@io_k8s_apimachinery//pkg/labels:go_default_library", "@io_k8s_client_go//tools/cache:go_default_library", diff --git a/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/expansion_generated.go b/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/expansion_generated.go similarity index 98% rename from backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/expansion_generated.go rename to backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/expansion_generated.go index 406264856d2..385843a305d 100644 --- a/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/expansion_generated.go +++ b/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/expansion_generated.go @@ -13,7 +13,7 @@ // limitations under the License. // Code generated by lister-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 // ScheduledWorkflowListerExpansion allows custom methods to be added to // ScheduledWorkflowLister. diff --git a/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/scheduledworkflow.go b/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/scheduledworkflow.go similarity index 79% rename from backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/scheduledworkflow.go rename to backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/scheduledworkflow.go index 331d236d57a..9117e7ba765 100644 --- a/backend/src/crd/pkg/client/listers/scheduledworkflow/v1alpha1/scheduledworkflow.go +++ b/backend/src/crd/pkg/client/listers/scheduledworkflow/v1beta1/scheduledworkflow.go @@ -13,10 +13,10 @@ // limitations under the License. // Code generated by lister-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( - v1alpha1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1alpha1" + v1beta1 "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" @@ -25,7 +25,7 @@ import ( // ScheduledWorkflowLister helps list ScheduledWorkflows. type ScheduledWorkflowLister interface { // List lists all ScheduledWorkflows in the indexer. - List(selector labels.Selector) (ret []*v1alpha1.ScheduledWorkflow, err error) + List(selector labels.Selector) (ret []*v1beta1.ScheduledWorkflow, err error) // ScheduledWorkflows returns an object that can list and get ScheduledWorkflows. ScheduledWorkflows(namespace string) ScheduledWorkflowNamespaceLister ScheduledWorkflowListerExpansion @@ -42,9 +42,9 @@ func NewScheduledWorkflowLister(indexer cache.Indexer) ScheduledWorkflowLister { } // List lists all ScheduledWorkflows in the indexer. -func (s *scheduledWorkflowLister) List(selector labels.Selector) (ret []*v1alpha1.ScheduledWorkflow, err error) { +func (s *scheduledWorkflowLister) List(selector labels.Selector) (ret []*v1beta1.ScheduledWorkflow, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.ScheduledWorkflow)) + ret = append(ret, m.(*v1beta1.ScheduledWorkflow)) }) return ret, err } @@ -57,9 +57,9 @@ func (s *scheduledWorkflowLister) ScheduledWorkflows(namespace string) Scheduled // ScheduledWorkflowNamespaceLister helps list and get ScheduledWorkflows. type ScheduledWorkflowNamespaceLister interface { // List lists all ScheduledWorkflows in the indexer for a given namespace. - List(selector labels.Selector) (ret []*v1alpha1.ScheduledWorkflow, err error) + List(selector labels.Selector) (ret []*v1beta1.ScheduledWorkflow, err error) // Get retrieves the ScheduledWorkflow from the indexer for a given namespace and name. - Get(name string) (*v1alpha1.ScheduledWorkflow, error) + Get(name string) (*v1beta1.ScheduledWorkflow, error) ScheduledWorkflowNamespaceListerExpansion } @@ -71,21 +71,21 @@ type scheduledWorkflowNamespaceLister struct { } // List lists all ScheduledWorkflows in the indexer for a given namespace. -func (s scheduledWorkflowNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.ScheduledWorkflow, err error) { +func (s scheduledWorkflowNamespaceLister) List(selector labels.Selector) (ret []*v1beta1.ScheduledWorkflow, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.ScheduledWorkflow)) + ret = append(ret, m.(*v1beta1.ScheduledWorkflow)) }) return ret, err } // Get retrieves the ScheduledWorkflow from the indexer for a given namespace and name. -func (s scheduledWorkflowNamespaceLister) Get(name string) (*v1alpha1.ScheduledWorkflow, error) { +func (s scheduledWorkflowNamespaceLister) Get(name string) (*v1beta1.ScheduledWorkflow, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err } if !exists { - return nil, errors.NewNotFound(v1alpha1.Resource("scheduledworkflow"), name) + return nil, errors.NewNotFound(v1beta1.Resource("scheduledworkflow"), name) } - return obj.(*v1alpha1.ScheduledWorkflow), nil + return obj.(*v1beta1.ScheduledWorkflow), nil } diff --git a/backend/src/crd/samples/scheduledworkflow/concurrency.yaml b/backend/src/crd/samples/scheduledworkflow/concurrency.yaml index 9f4485f3074..7009fa4488b 100644 --- a/backend/src/crd/samples/scheduledworkflow/concurrency.yaml +++ b/backend/src/crd/samples/scheduledworkflow/concurrency.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: concurrency diff --git a/backend/src/crd/samples/scheduledworkflow/every-minute-cron.yaml b/backend/src/crd/samples/scheduledworkflow/every-minute-cron.yaml index 048a4b2052e..53d7289a084 100644 --- a/backend/src/crd/samples/scheduledworkflow/every-minute-cron.yaml +++ b/backend/src/crd/samples/scheduledworkflow/every-minute-cron.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: every-minute-cron diff --git a/backend/src/crd/samples/scheduledworkflow/every-minute-periodic.yaml b/backend/src/crd/samples/scheduledworkflow/every-minute-periodic.yaml index 39b71bc3c08..9c04549efe1 100644 --- a/backend/src/crd/samples/scheduledworkflow/every-minute-periodic.yaml +++ b/backend/src/crd/samples/scheduledworkflow/every-minute-periodic.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: every-minute-periodic diff --git a/backend/src/crd/samples/scheduledworkflow/invalid.yaml b/backend/src/crd/samples/scheduledworkflow/invalid.yaml index c0de5aadf43..5f535a659ba 100644 --- a/backend/src/crd/samples/scheduledworkflow/invalid.yaml +++ b/backend/src/crd/samples/scheduledworkflow/invalid.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: invalid diff --git a/backend/src/crd/samples/scheduledworkflow/no-history.yaml b/backend/src/crd/samples/scheduledworkflow/no-history.yaml index c691296b416..6fc08b93a06 100644 --- a/backend/src/crd/samples/scheduledworkflow/no-history.yaml +++ b/backend/src/crd/samples/scheduledworkflow/no-history.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: no-history diff --git a/backend/src/crd/samples/scheduledworkflow/parameterized.yaml b/backend/src/crd/samples/scheduledworkflow/parameterized.yaml index 27ae971a01a..61da6cb51c5 100644 --- a/backend/src/crd/samples/scheduledworkflow/parameterized.yaml +++ b/backend/src/crd/samples/scheduledworkflow/parameterized.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: "kubeflow.org/v1alpha1" +apiVersion: "kubeflow.org/v1beta1" kind: ScheduledWorkflow metadata: name: parameterized diff --git a/backend/src/crd/samples/scheduledworkflow/single-run.yaml b/backend/src/crd/samples/scheduledworkflow/single-run.yaml index 9201e7c5a88..3cac6f0f0c9 100644 --- a/backend/src/crd/samples/scheduledworkflow/single-run.yaml +++ b/backend/src/crd/samples/scheduledworkflow/single-run.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: single-run diff --git a/backend/src/crd/samples/scheduledworkflow/start-end-cron.yaml b/backend/src/crd/samples/scheduledworkflow/start-end-cron.yaml index 45777be0797..d4a141a7238 100644 --- a/backend/src/crd/samples/scheduledworkflow/start-end-cron.yaml +++ b/backend/src/crd/samples/scheduledworkflow/start-end-cron.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: start-end-cron diff --git a/backend/src/crd/samples/scheduledworkflow/start-end-periodic.yaml b/backend/src/crd/samples/scheduledworkflow/start-end-periodic.yaml index 28fae2c376e..a7421591584 100644 --- a/backend/src/crd/samples/scheduledworkflow/start-end-periodic.yaml +++ b/backend/src/crd/samples/scheduledworkflow/start-end-periodic.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kubeflow.org/v1alpha1 +apiVersion: kubeflow.org/v1beta1 kind: ScheduledWorkflow metadata: name: start-end-periodic diff --git a/backend/src/crd/samples/viewer/mnist.yaml b/backend/src/crd/samples/viewer/mnist.yaml index 3c3741caa22..06023f84ba5 100644 --- a/backend/src/crd/samples/viewer/mnist.yaml +++ b/backend/src/crd/samples/viewer/mnist.yaml @@ -15,7 +15,7 @@ # This sample launches a viewer instance on Tensorboard, pointing to Tensorflow # output from training the standard MNIST model located at # gs://ml-pipeline-playground/mnist -apiVersion: "kubeflow.org/v1alpha1" +apiVersion: "kubeflow.org/v1beta1" kind: Viewer metadata: generateName: viewer- diff --git a/backend/src/crd/samples/viewer/tensorboard-persistent-volume.yaml b/backend/src/crd/samples/viewer/tensorboard-persistent-volume.yaml index 854bf294d21..ae3d3b74656 100644 --- a/backend/src/crd/samples/viewer/tensorboard-persistent-volume.yaml +++ b/backend/src/crd/samples/viewer/tensorboard-persistent-volume.yaml @@ -18,7 +18,7 @@ # 'my-persistent-disk' in the cluster. This persistent disk will be mounted to # /mountedlogdir, which is also specified as the logdir parameter for # Tensorboard. -apiVersion: "kubeflow.org/v1alpha1" +apiVersion: "kubeflow.org/v1beta1" kind: Viewer metadata: generateName: viewer- diff --git a/frontend/mock-backend/integration-test-runtime.ts b/frontend/mock-backend/integration-test-runtime.ts index 506a4cbe8b0..6716f345487 100644 --- a/frontend/mock-backend/integration-test-runtime.ts +++ b/frontend/mock-backend/integration-test-runtime.ts @@ -31,7 +31,7 @@ export default { }, ownerReferences: [ { - apiVersion: 'kubeflow.org/v1alpha1', + apiVersion: 'kubeflow.org/v1beta1', kind: 'ScheduledWorkflow', name: 'job-cloneofhelloworldls94q', uid: '4fac8e0f-d688-11e8-83db-42010a800093', diff --git a/frontend/mock-backend/mock-xgboost-small-runtime.ts b/frontend/mock-backend/mock-xgboost-small-runtime.ts index 199a044cc33..d30db340133 100644 --- a/frontend/mock-backend/mock-xgboost-small-runtime.ts +++ b/frontend/mock-backend/mock-xgboost-small-runtime.ts @@ -30,7 +30,7 @@ export default { }, ownerReferences: [ { - apiVersion: 'kubeflow.org/v1alpha1', + apiVersion: 'kubeflow.org/v1beta1', kind: 'ScheduledWorkflow', name: 'job-xgboosttrainingm7t2r', uid: '2d3b0ed1-cdef-11e8-8c17-42010a8a0078', diff --git a/go.mod b/go.mod index 12a31d58435..1218b387ce2 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/argoproj/argo v2.2.0+incompatible github.com/cenkalti/backoff v2.0.0+incompatible github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f // indirect + github.com/docker/distribution v2.7.0+incompatible // indirect github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect github.com/emicklei/go-restful v2.8.0+incompatible // indirect @@ -24,7 +25,7 @@ require ( github.com/go-openapi/swag v0.17.0 github.com/go-openapi/validate v0.17.2 github.com/go-sql-driver/mysql v1.4.0 - github.com/gogo/protobuf v1.1.1 // indirect + github.com/gogo/protobuf v1.1.1 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect github.com/golang/protobuf v1.2.0 @@ -56,6 +57,7 @@ require ( github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect github.com/onsi/ginkgo v1.7.0 // indirect github.com/onsi/gomega v1.4.3 // indirect + github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.8.0 github.com/prometheus/client_golang v0.9.2 // indirect @@ -81,8 +83,11 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.39.3 // indirect k8s.io/api v0.0.0-20180712090710-2d6f90ab1293 + k8s.io/apiextensions-apiserver v0.0.0-20190103235604-e7617803aceb // indirect k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d + k8s.io/apiserver v0.0.0-20190112184317-d55c9aeff1eb k8s.io/client-go v0.0.0-20180718001006-59698c7d9724 + k8s.io/klog v0.1.0 // indirect k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 // indirect k8s.io/kubernetes v1.11.1 sigs.k8s.io/controller-runtime v0.0.0-20181121180216-5558165425ef diff --git a/go.sum b/go.sum index 882dcf3975c..1042c08173d 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,7 @@ github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgX github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0= github.com/argoproj/argo v2.2.0+incompatible h1:2CfmV2Ov7qGM7p2Jo0YkyD2SuuDNopbp426NdNrWJmc= github.com/argoproj/argo v2.2.0+incompatible/go.mod h1:KJ0MB+tuhtAklR4jkPM10mIZXfRA0peTYJ1sLUnFLVU= +github.com/argoproj/argo v2.2.1+incompatible h1:FAXd83gaZZhkFvqsc24g1BSf79WZaFS7btcKePH5t4o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= @@ -27,6 +28,8 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc= +github.com/docker/distribution v2.7.0+incompatible h1:neUDAlf3wX6Ml4HdqTrbcOHXtfRN0TFIwt6YFL7N9RU= +github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 h1:llBx5m8Gk0lrAaiLud2wktkX/e8haX7Ru0oVfQqtZQ4= github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= @@ -149,6 +152,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= @@ -245,10 +250,16 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.0.0-20180712090710-2d6f90ab1293 h1:hROmpFC7JMobXFXMmD7ZKZLhDKvr1IKfFJoYS/45G/8= k8s.io/api v0.0.0-20180712090710-2d6f90ab1293/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/apiextensions-apiserver v0.0.0-20190103235604-e7617803aceb h1:3yElwSbnV34qIVTlGgkbWwWM+wq7fw6i7EKRtLV6z58= +k8s.io/apiextensions-apiserver v0.0.0-20190103235604-e7617803aceb/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d h1:MZjlsu9igBoVPZkXpIGoxI6EonqNsXXZU7hhvfQLkd4= k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/apiserver v0.0.0-20190112184317-d55c9aeff1eb h1:ubI75aPYYixH0hGKJkO2oqpbyWBZMcYL2YVgDTEYkV4= +k8s.io/apiserver v0.0.0-20190112184317-d55c9aeff1eb/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= k8s.io/client-go v0.0.0-20180718001006-59698c7d9724 h1:6gXlQ4rPEmQ86ugMoxdryE8Pu/+2tvcN7ulE74xAWcw= k8s.io/client-go v0.0.0-20180718001006-59698c7d9724/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +k8s.io/klog v0.1.0 h1:I5HMfc/DtuVaGR1KPwUrTc476K8NCqNBldC7H4dYEzk= +k8s.io/klog v0.1.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 h1:C8xi0mJeE8wOFsLofmG7JVxRV2ZAgjYftRc9m2ypdmo= k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kubernetes v1.11.1 h1:wHOPX+teuYaSlUWfL/b24jMH0n7HECbj4Xt8i7kSZIw= diff --git a/pipeline/pipeline/argo.libsonnet b/pipeline/pipeline/argo.libsonnet index aaa74157bad..04ca639b456 100644 --- a/pipeline/pipeline/argo.libsonnet +++ b/pipeline/pipeline/argo.libsonnet @@ -31,7 +31,7 @@ singular: "workflow", }, scope: "Namespaced", - version: "v1alpha1", + version: "v1beta1", }, }, // crd diff --git a/pipeline/pipeline/pipeline-scheduledworkflow.libsonnet b/pipeline/pipeline/pipeline-scheduledworkflow.libsonnet index 18f1e4d9b33..2f34c1c06b5 100644 --- a/pipeline/pipeline/pipeline-scheduledworkflow.libsonnet +++ b/pipeline/pipeline/pipeline-scheduledworkflow.libsonnet @@ -152,7 +152,7 @@ singular: "scheduledworkflow", }, scope: "Namespaced", - version: "v1alpha1", + version: "v1beta1", }, }, // crd }, // parts diff --git a/sdk/python/kfp/compiler/compiler.py b/sdk/python/kfp/compiler/compiler.py index 7c0dface55b..7fb3d716141 100644 --- a/sdk/python/kfp/compiler/compiler.py +++ b/sdk/python/kfp/compiler/compiler.py @@ -23,7 +23,7 @@ from ._k8s_helper import K8sHelper class Compiler(object): - """DSL Compiler. + """DSL Compiler. It compiles DSL pipeline functions into workflow yaml. Example usage: ```python @@ -84,7 +84,7 @@ def _get_groups_helper(group): return groups return _get_groups_helper(root_group) - + def _get_uncommon_ancestors(self, op_groups, op1, op2): """Helper function to get unique ancestors between two ops. @@ -144,7 +144,7 @@ def _get_inputs_outputs(self, pipeline, root_group, op_groups): for g in op_groups[op.name]: inputs[g].add((full_name, None)) return inputs, outputs - + def _get_condition_params_for_ops(self, root_group): """Get parameters referenced in conditions of ops.""" @@ -166,7 +166,7 @@ def _get_condition_params_for_ops_helper(group, current_conditions_params): _get_condition_params_for_ops_helper(root_group, []) return conditions - + def _get_dependencies(self, pipeline, root_group, op_groups): """Get dependent groups and ops for all ops and groups. @@ -333,7 +333,7 @@ def _build_conventional_artifact(name): def _group_to_template(self, group, inputs, outputs, dependencies): """Generate template given an OpsGroup. - + inputs, outputs, dependencies are all helper dicts. """ template = {'name': group.name} @@ -401,7 +401,7 @@ def _group_to_template(self, group, inputs, outputs, dependencies): tasks.append(task) tasks.sort(key=lambda x: x['name']) template['dag'] = {'tasks': tasks} - return template + return template def _create_templates(self, pipeline): """Create all groups and ops templates in the pipeline.""" @@ -517,7 +517,7 @@ def _compile(self, pipeline_func): with dsl.Pipeline(pipeline_name) as p: pipeline_func(*args_list) - # Remove when argo supports local exit handler. + # Remove when argo supports local exit handler. self._validate_exit_handler(p) # Fill in the default values. diff --git a/sdk/python/tests/compiler/testdata/basic.yaml b/sdk/python/tests/compiler/testdata/basic.yaml index 4298bf1e751..a10367594d1 100644 --- a/sdk/python/tests/compiler/testdata/basic.yaml +++ b/sdk/python/tests/compiler/testdata/basic.yaml @@ -152,7 +152,7 @@ spec: tf-version.cloud-tpus.google.com: "1.12" name: save nodeSelector: - cloud.google.com/gke-accelerator: nvidia-tesla-k80 + cloud.google.com/gke-accelerator: nvidia-tesla-k80 outputs: artifacts: - name: mlpipeline-ui-metadata