Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/pro/cluster/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (cmd *ClusterCmd) setupCluster(
return clusterSetup{}, err
}

accessKey, err := managementClient.Loft().
accessKey, err := managementClient.Devsy().
ManagementV1().
Clusters().
GetAccessKey(ctx, clusterName, metav1.GetOptions{})
Expand All @@ -175,7 +175,7 @@ func (cmd *ClusterCmd) createClusterResource(
managementClient kube.Interface,
params createClusterParams,
) error {
_, err := managementClient.Loft().ManagementV1().Clusters().Create(ctx, &managementv1.Cluster{
_, err := managementClient.Devsy().ManagementV1().Clusters().Create(ctx, &managementv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: params.clusterName,
},
Expand Down Expand Up @@ -401,7 +401,7 @@ func waitForClusterInitialized(
5*time.Minute,
false,
func(ctx context.Context) (done bool, err error) {
clusterInstance, err := managementClient.Loft().
clusterInstance, err := managementClient.Devsy().
ManagementV1().
Clusters().
Get(ctx, clusterName, metav1.GetOptions{})
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (cmd *DeleteCmd) Run(
return err
}

err = managementClient.Loft().
err = managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(workspace.Namespace).
Delete(ctx, workspace.Name, metav1.DeleteOptions{})
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/list/clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func Clusters(
return nil, err
}

clustersList, err := managementClient.Loft().
clustersList, err := managementClient.Devsy().
ManagementV1().
Projects().
ListClusters(ctx, projectName, metav1.GetOptions{})
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/list/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func Projects(ctx context.Context, client client.Client) (*managementv1.ProjectL
return nil, err
}

projectList, err := managementClient.Loft().
projectList, err := managementClient.Devsy().
ManagementV1().
Projects().
List(ctx, metav1.ListOptions{})
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/provider/list/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func Templates(
return nil, err
}

templateList, err := managementClient.Loft().
templateList, err := managementClient.Devsy().
ManagementV1().
Projects().
ListTemplates(ctx, projectName, metav1.GetOptions{})
Expand All @@ -99,7 +99,7 @@ func FindTemplate(
managementClient kube.Interface,
projectName, templateName string,
) (*managementv1.DevsyWorkspaceTemplate, error) {
templateList, err := managementClient.Loft().
templateList, err := managementClient.Devsy().
ManagementV1().
Projects().
ListTemplates(ctx, projectName, metav1.GetOptions{})
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/provider/list/workspaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (cmd *WorkspacesCmd) Run(ctx context.Context) error {
return err
}

projectList, err := managementClient.Loft().
projectList, err := managementClient.Devsy().
ManagementV1().
Projects().
List(ctx, metav1.ListOptions{})
Expand Down Expand Up @@ -98,7 +98,7 @@ func projectWorkspaces(
params projectWorkspacesParams,
) []*managementv1.DevsyWorkspaceInstance {
ns := project.ProjectNamespace(params.projectName)
workspaceList, err := params.managementClient.Loft().
workspaceList, err := params.managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(ns).
List(ctx, metav1.ListOptions{})
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/provider/watch/workspaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1"
loftclient "github.com/devsy-org/api/pkg/clientset/versioned"
devsyclient "github.com/devsy-org/api/pkg/clientset/versioned"
informers "github.com/devsy-org/api/pkg/informers/externalversions"
informermanagementv1 "github.com/devsy-org/api/pkg/informers/externalversions/management/v1"
"github.com/devsy-org/devsy/cmd/pro/flags"
Expand Down Expand Up @@ -89,7 +89,7 @@ func (cmd *WorkspacesCmd) Run(
return err
}

clientset, err := loftclient.NewForConfig(managementConfig)
clientset, err := devsyclient.NewForConfig(managementConfig)
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/user/reset_password.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (cmd *PasswordCmd) resolveUser(
ctx context.Context,
managementClient kube.Interface,
) (*storagev1.User, error) {
user, err := managementClient.Loft().
user, err := managementClient.Devsy().
StorageV1().
Users().
Get(ctx, cmd.User, metav1.GetOptions{})
Expand All @@ -131,7 +131,7 @@ func (cmd *PasswordCmd) resolveUser(
)
}

user, err = managementClient.Loft().
user, err = managementClient.Devsy().
StorageV1().
Users().
Create(ctx, &storagev1.User{
Expand Down Expand Up @@ -164,7 +164,7 @@ func (cmd *PasswordCmd) persistPasswordRef(
if !changed {
return nil
}
_, err := managementClient.Loft().
_, err := managementClient.Devsy().
StorageV1().
Users().
Update(ctx, user, metav1.UpdateOptions{})
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/workspace/sleep.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (cmd *SleepCmd) patchSleep(
return fmt.Errorf("create patch: %w", err)
}

_, err = managementClient.Loft().
_, err = managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(project.ProjectNamespace(cmd.Project)).
Patch(ctx, workspaceInstance.Name, patch.Type(), patchData, metav1.PatchOptions{})
Expand All @@ -177,7 +177,7 @@ func waitForWorkspacePhase(
platform.Timeout(),
false,
func(ctx context.Context) (done bool, err error) {
workspaceInstance, err := params.managementClient.Loft().
workspaceInstance, err := params.managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(project.ProjectNamespace(params.projectName)).
Get(ctx, params.name, metav1.GetOptions{})
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/workspace/wakeup.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func (cmd *WakeupCmd) patchWakeup(
return err
}

_, err = managementClient.Loft().
_, err = managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(project.ProjectNamespace(cmd.Project)).
Patch(ctx, workspaceInstance.Name, patch.Type(), patchData, metav1.PatchOptions{})
Expand Down
3 changes: 1 addition & 2 deletions cmd/workspace/troubleshoot.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,7 @@ func collectProWorkspaceInfo(
return nil, fmt.Errorf("management: %w", err)
}

troubleshoot, err := managementClient.
Loft().
troubleshoot, err := managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(workspace.Namespace).
Troubleshoot(ctx, workspace.Name, metav1.GetOptions{})
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/clientimplementation/daemonclient/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (c *client) deleteInstance(
workspace *managementv1.DevsyWorkspaceInstance,
force bool,
) error {
err := managementClient.Loft().
err := managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(workspace.Namespace).
Delete(ctx, workspace.Name, metav1.DeleteOptions{})
Expand Down Expand Up @@ -130,7 +130,7 @@ func (c *client) waitForWorkspaceDeleted(
waitTimeout,
false,
func(ctx context.Context) (done bool, err error) {
workspaceInstance, err := managementClient.Loft().
workspaceInstance, err := managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(workspace.Namespace).
Get(ctx, workspace.Name, metav1.GetOptions{})
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientimplementation/daemonclient/stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (c *client) Stop(ctx context.Context, opt clientpkg.StopOptions) error {
}

rawOptions, _ := json.Marshal(opt)
retStop, err := managementClient.Loft().
retStop, err := managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(workspace.Namespace).
Stop(ctx, workspace.Name, &managementv1.DevsyWorkspaceInstanceStop{
Expand Down
12 changes: 6 additions & 6 deletions pkg/client/clientimplementation/daemonclient/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func cancelActiveUpTask(
}

log.Warnf("Found active up task %s, attempting to cancel it", activeUpTask.ID)
_, err := managementClient.Loft().
_, err := managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(instance.Namespace).
Cancel(ctx, instance.Name, &managementv1.DevsyWorkspaceInstanceCancel{
Expand All @@ -191,7 +191,7 @@ func cancelActiveUpTask(
}

func createUpTask(ctx context.Context, params createUpTaskParams) (string, error) {
task, err := params.managementClient.Loft().
task, err := params.managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(params.instance.Namespace).
Up(ctx, params.instance.Name, &managementv1.DevsyWorkspaceInstanceUp{
Expand Down Expand Up @@ -226,7 +226,7 @@ func waitTaskDone(

// get result
tasks := &managementv1.DevsyWorkspaceInstanceTasks{}
err = managementClient.Loft().ManagementV1().RESTClient().Get().
err = managementClient.Devsy().ManagementV1().RESTClient().Get().
Namespace(instance.Namespace).
Resource("devsyworkspaceinstances").
Name(instance.Name).
Expand Down Expand Up @@ -311,7 +311,7 @@ func observeTask(
defer cancel()
defer cancelPrintCtx()

_, err := managementClient.Loft().
_, err := managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(instance.Namespace).
Cancel(timeoutCtx, instance.Name, &managementv1.DevsyWorkspaceInstanceCancel{
Expand Down Expand Up @@ -387,7 +387,7 @@ func openTaskLogsStream(
taskID string,
) (io.ReadCloser, error) {
log.Debugf("printing logs of task: %s", taskID)
logsReader, err := managementClient.Loft().ManagementV1().RESTClient().Get().
logsReader, err := managementClient.Devsy().ManagementV1().RESTClient().Get().
Namespace(workspace.Namespace).
Resource("devsyworkspaceinstances").
Name(workspace.Name).
Expand Down Expand Up @@ -582,7 +582,7 @@ func findActiveUpTask(
instance *managementv1.DevsyWorkspaceInstance,
) (*managementv1.DevsyWorkspaceInstanceTask, error) {
tasks := &managementv1.DevsyWorkspaceInstanceTasks{}
err := managementClient.Loft().ManagementV1().RESTClient().Get().
err := managementClient.Devsy().ManagementV1().RESTClient().Get().
Namespace(instance.Namespace).
Resource("devsyworkspaceinstances").
Name(instance.Name).
Expand Down
16 changes: 8 additions & 8 deletions pkg/daemon/platform/local_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (l *localServer) watchPlatform(stopChan <-chan struct{}) {
if err != nil {
log.Error(fmt.Errorf("create mangement client: %w", err))
} else {
_, err = managementClient.Loft().
_, err = managementClient.Devsy().
ManagementV1().
Selves().
Create(context.Background(), &managementv1.Self{}, metav1.CreateOptions{})
Expand Down Expand Up @@ -295,7 +295,7 @@ func (l *localServer) userProfile(
}
userName := l.pc.Self().Status.User.Name

profile, err := managementClient.Loft().
profile, err := managementClient.Devsy().
ManagementV1().
Users().
GetProfile(r.Context(), userName, metav1.GetOptions{})
Expand All @@ -322,7 +322,7 @@ func (l *localServer) updateUserProfile(
return err
}
userName := l.pc.Self().Status.User.Name
updatedProfile, err := managementClient.Loft().
updatedProfile, err := managementClient.Devsy().
ManagementV1().
Users().
UpdateProfile(r.Context(), userName, profile, metav1.CreateOptions{})
Expand All @@ -339,7 +339,7 @@ func (l *localServer) projects(w http.ResponseWriter, r *http.Request) error {
return err
}

projectList, err := managementClient.Loft().
projectList, err := managementClient.Devsy().
ManagementV1().
Projects().
List(r.Context(), metav1.ListOptions{})
Expand All @@ -365,7 +365,7 @@ func (l *localServer) projectTemplates(
return err
}

templateList, err := managementClient.Loft().
templateList, err := managementClient.Devsy().
ManagementV1().
Projects().
ListTemplates(r.Context(), projectName, metav1.GetOptions{})
Expand Down Expand Up @@ -393,7 +393,7 @@ func (l *localServer) projectClusters(
return err
}

clusterList, err := managementClient.Loft().
clusterList, err := managementClient.Devsy().
ManagementV1().
Projects().
ListClusters(r.Context(), projectName, metav1.GetOptions{})
Expand Down Expand Up @@ -422,7 +422,7 @@ func collectProjectWorkspaces(
ownerFilter workspaceOwnerFilter,
) ([]managementv1.DevsyWorkspaceInstance, error) {
ns := project.ProjectNamespace(p.GetName())
workspaceList, err := managementClient.Loft().
workspaceList, err := managementClient.Devsy().
ManagementV1().
DevsyWorkspaceInstances(ns).
List(ctx, metav1.ListOptions{})
Expand Down Expand Up @@ -462,7 +462,7 @@ func (l *localServer) listWorkspace(
return err
}

projectList, err := managementClient.Loft().
projectList, err := managementClient.Devsy().
ManagementV1().
Projects().
List(r.Context(), metav1.ListOptions{})
Expand Down
8 changes: 4 additions & 4 deletions pkg/daemon/platform/workspace_watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1"
loftclient "github.com/devsy-org/api/pkg/clientset/versioned"
devsyclient "github.com/devsy-org/api/pkg/clientset/versioned"
typedmanagementv1 "github.com/devsy-org/api/pkg/clientset/versioned/typed/management/v1"
informers "github.com/devsy-org/api/pkg/informers/externalversions"
"github.com/devsy-org/devsy/pkg/log"
Expand Down Expand Up @@ -432,8 +432,8 @@ func (s *instanceStore) pingAndRecord(
s.metricsMu.Unlock()
}

func getClientSet(config *rest.Config) (loftclient.Interface, error) {
clientset, err := loftclient.NewForConfig(config)
func getClientSet(config *rest.Config) (devsyclient.Interface, error) {
clientset, err := devsyclient.NewForConfig(config)
if err != nil {
return nil, err
}
Expand All @@ -449,7 +449,7 @@ func getClientSet(config *rest.Config) (loftclient.Interface, error) {
var _ rest.Interface = (*extendedRESTClient)(nil)

type extendedClientset struct {
*loftclient.Clientset
*devsyclient.Clientset
ManagementClient typedmanagementv1.ManagementV1Interface
}

Expand Down
Loading
Loading