Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update devfile/api dependency and populate devworkspace.status.message with info about failures #239

Closed
wants to merge 4 commits into from
Closed

Update devfile/api dependency and populate devworkspace.status.message with info about failures #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aaec691
Update to latest devfile/api commit f33d2987
amisevsk Jan 8, 2021
9237c45
Update samples to be in-spec
amisevsk Jan 8, 2021
02ea883
Update webhooks to specify that they have no side effects
amisevsk Jan 8, 2021
348bb1c
Propagate condition message to status.message on failure or error
amisevsk Jan 8, 2021
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export WEBHOOK_ENABLED ?= true
export DEFAULT_ROUTING ?= basic
export KUBECONFIG ?= ${HOME}/.kube/config
REGISTRY_ENABLED ?= true
DEVWORKSPACE_API_VERSION ?= aeda60d4361911da85103f224644bfa792498499
DEVWORKSPACE_API_VERSION ?= f33d2987d137225cd1e8975f6fdfdd2663195a37

#internal params
DEVWORKSPACE_CTRL_SA=devworkspace-controller-serviceaccount
Expand Down Expand Up @@ -110,7 +110,7 @@ endif
##### Rules for dealing with devfile/api
### update_devworkspace_api: update version of devworkspace crds in go.mod
update_devworkspace_api:
go mod edit --require github.com/devfile/api@$(DEVWORKSPACE_API_VERSION)
go mod edit --require github.com/devfile/api/v2@$(DEVWORKSPACE_API_VERSION)
go mod download
go mod tidy

Expand Down
2 changes: 1 addition & 1 deletion apis/controller/v1alpha1/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package v1alpha1

import (
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

// Description of a devfile component's workspace additions
Expand Down
2 changes: 1 addition & 1 deletion apis/controller/v1alpha1/component_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package v1alpha1

import (
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/controller/v1alpha1/workspacerouting_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package v1alpha1

import (
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/controller/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion controllers/controller/component/cmd_terminal/cmd_terminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package cmd_terminal
import (
"strings"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion controllers/controller/component/component_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (

controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/pkg/library"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/controller/workspacerouting/solvers/cluster_solver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/devfile/devworkspace-operator/pkg/common"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/config"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/controller/workspacerouting/solvers/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package solvers

import (
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/common"
"github.com/devfile/devworkspace-operator/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

maputils "github.com/devfile/devworkspace-operator/internal/map"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/common"
"github.com/devfile/devworkspace-operator/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion controllers/controller/workspacerouting/solvers/resolve_endpoints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"net/url"
"strings"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/config"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/devworkspace_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/controllers/workspace/provision"
"github.com/devfile/devworkspace-operator/controllers/workspace/restapis"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/finalize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"path"
"time"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/controllers/workspace/provision"
"github.com/devfile/devworkspace-operator/internal/images"
"github.com/devfile/devworkspace-operator/pkg/common"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/predicates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package controllers

import (
"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"k8s.io/apimachinery/pkg/api/equality"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/predicate"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/provision/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"errors"
"fmt"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/controllers/controller/component/cmd_terminal"
"github.com/devfile/devworkspace-operator/pkg/adaptor"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/provision/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/devfile/devworkspace-operator/pkg/common"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/controllers/workspace/env"
"github.com/devfile/devworkspace-operator/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/provision/pvc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package provision

import (
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/config"
"github.com/go-logr/logr"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/provision/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package provision

import (
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/pkg/config"
"github.com/go-logr/logr"
rbacv1 "k8s.io/api/rbac/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/provision/routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"context"
"fmt"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/config"
"github.com/google/go-cmp/cmp"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/provision/serviceaccount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package provision
import (
"context"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/pkg/common"
"github.com/google/go-cmp/cmp"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/restapis/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package restapis
import (
"strings"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/common"
"github.com/devfile/devworkspace-operator/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/restapis/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"context"
"encoding/json"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/controllers/workspace/provision"
"github.com/devfile/devworkspace-operator/pkg/common"
Expand Down
2 changes: 1 addition & 1 deletion controllers/workspace/restapis/devfilev1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"path"
"strings"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
workspaceApi "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/config"
)
Expand Down
18 changes: 17 additions & 1 deletion controllers/workspace/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/go-logr/logr"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/controllers/workspace/provision"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -79,6 +79,8 @@ func (r *DevWorkspaceReconciler) updateWorkspaceStatus(workspace *devworkspace.D
sort.SliceStable(workspace.Status.Conditions, func(i, j int) bool {
return strings.Compare(string(workspace.Status.Conditions[i].Type), string(workspace.Status.Conditions[j].Type)) > 0
})
infoMessage := getInfoMessage(status.Conditions)
workspace.Status.Message = infoMessage

err := r.Status().Update(context.TODO(), workspace)
if err != nil {
Expand Down Expand Up @@ -138,3 +140,17 @@ func getIdeUrl(exposedEndpoints map[string]v1alpha1.ExposedEndpointList) string
}
return ""
}

func getInfoMessage(conditions map[devworkspace.WorkspaceConditionType]string) string {
var failedStartMsg string
for conditionType, conditionMessage := range conditions {
switch conditionType {
// Take error condition message as overriding failed start message
case "Error":
return conditionMessage
case devworkspace.WorkspaceFailedStart:
failedStartMsg = conditionMessage
}
}
return failedStartMsg
}
2 changes: 1 addition & 1 deletion controllers/workspace/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package controllers
import (
"fmt"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/pkg/config"
"github.com/devfile/devworkspace-operator/pkg/webhook"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/devfile/devworkspace-operator
go 1.13

require (
github.com/devfile/api v0.0.0-20201125082321-aeda60d43619
github.com/devfile/api/v2 v2.0.0-20210105203253-f33d2987d137
github.com/eclipse/che-go-jsonrpc v0.0.0-20200317130110-931966b891fe // indirect
github.com/eclipse/che-plugin-broker v3.4.0+incompatible
github.com/go-logr/logr v0.1.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
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/devfile/api v0.0.0-20201125082321-aeda60d43619 h1:1pTtDONDby55+kqHhvSqPiVKIGf1OJRY1vXCeHFG+wU=
github.com/devfile/api v0.0.0-20201125082321-aeda60d43619/go.mod h1:/aDiwWjDEW/fY1/Ig8umVtmneAXKZImnLvWqzMlcfrY=
github.com/devfile/api/v2 v2.0.0-20210105203253-f33d2987d137 h1:9uT8z84dYIg3ROSB1CMXIS/b/7Ddev4lxSEOXeMkvWU=
github.com/devfile/api/v2 v2.0.0-20210105203253-f33d2987d137/go.mod h1:ujP0i3nip2g/aSOXGEy3A7vTC6EIe1kZf9Cteja6OJg=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/devfile/devworkspace-operator/pkg/config"
"github.com/devfile/devworkspace-operator/pkg/webhook"

workspacev1alpha1 "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
workspacev1alpha2 "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
workspacev1alpha1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha1"
workspacev1alpha2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
workspacecontroller "github.com/devfile/devworkspace-operator/controllers/workspace"

Expand Down
2 changes: 1 addition & 1 deletion pkg/adaptor/artifacts_broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"encoding/json"
"fmt"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/common"
"github.com/devfile/devworkspace-operator/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/adaptor/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package adaptor

import (
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"

"github.com/devfile/devworkspace-operator/pkg/config"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/adaptor/dockerimage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"fmt"
"strings"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/pkg/common"
"github.com/devfile/devworkspace-operator/pkg/config"
Expand Down
4 changes: 2 additions & 2 deletions pkg/adaptor/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
"fmt"
"strings"

"github.com/devfile/api/pkg/attributes"
"github.com/devfile/api/v2/pkg/attributes"

"github.com/devfile/devworkspace-operator/pkg/adaptor/plugin_patch"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"

"github.com/devfile/devworkspace-operator/pkg/common"
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/cmd_terminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/devfile/devworkspace-operator/internal/images"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"

"sigs.k8s.io/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/library/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package library
import (
"fmt"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func getCommandType(command devworkspace.Command) (devworkspace.CommandType, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/library/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package library
import (
"fmt"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

// GetInitContainers partitions the components in a devfile's flattened spec into initContainer and non-initContainer lists
Expand Down
2 changes: 1 addition & 1 deletion pkg/library/lifecycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"path/filepath"
"testing"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/timing/annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package timing
import (
"strconv"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/timing/timing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"strconv"
"time"

devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/pkg/config"
)

Expand Down
Loading