Skip to content

Commit 1b1bc9e

Browse files
amisevskamisevsk
committed
Replace imports of devfile/kubernetes-api with devfile/api
Signed-off-by: Angel Misevski <[email protected]>
1 parent a6400d2 commit 1b1bc9e

29 files changed

+29
-29
lines changed

‎pkg/adaptor/artifacts_broker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"encoding/json"
1717
"fmt"
1818

19+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1920
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/common"
2122
"github.com/devfile/devworkspace-operator/pkg/config"
22-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2323
"github.com/eclipse/che-plugin-broker/model"
2424
corev1 "k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/resource"

‎pkg/adaptor/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package adaptor
1414

1515
import (
16-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1717

1818
"github.com/devfile/devworkspace-operator/pkg/config"
1919
corev1 "k8s.io/api/core/v1"

‎pkg/adaptor/dockerimage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"fmt"
1717
"strings"
1818

19+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1920
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/common"
2122
"github.com/devfile/devworkspace-operator/pkg/config"
22-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2323
corev1 "k8s.io/api/core/v1"
2424
)
2525

‎pkg/adaptor/plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"strconv"
1818
"strings"
1919

20+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
21-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2222

2323
"github.com/devfile/devworkspace-operator/pkg/common"
2424
"github.com/devfile/devworkspace-operator/pkg/config"

‎pkg/apis/addtoscheme_controller_v1alpha1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
package apis
1414

1515
import (
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1617
"github.com/devfile/devworkspace-operator/internal/cluster"
1718
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
18-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
1919
oauthv1 "github.com/openshift/api/oauth/v1"
2020
routeV1 "github.com/openshift/api/route/v1"
2121
templateV1 "github.com/openshift/api/template/v1"

‎pkg/apis/controller/v1alpha1/component.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package v1alpha1
1414

1515
import (
16-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1717
)
1818

1919
// Description of a devfile component's workspace additions

‎pkg/apis/controller/v1alpha1/component_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package v1alpha1
1414

1515
import (
16-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
)
1919

‎pkg/apis/controller/v1alpha1/workspacerouting_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package v1alpha1
1414

1515
import (
16-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
)
1919

‎pkg/apis/controller/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/config/cmd_terminal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

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

20-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
20+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
2121

2222
"gopkg.in/yaml.v2"
2323
)

‎pkg/controller/component/cmd_terminal/cmd_terminal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package cmd_terminal
1515
import (
1616
"strings"
1717

18-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
18+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1919
)
2020

2121
const (

‎pkg/controller/workspace/provision/components.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
"errors"
1818
"fmt"
1919

20+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/adaptor"
2122
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2223
"github.com/devfile/devworkspace-operator/pkg/config"
2324
"github.com/devfile/devworkspace-operator/pkg/controller/component/cmd_terminal"
24-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2525
"github.com/google/go-cmp/cmp"
2626
"github.com/google/go-cmp/cmp/cmpopts"
2727
k8sErrors "k8s.io/apimachinery/pkg/api/errors"

‎pkg/controller/workspace/provision/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020

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

23+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
2324
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2425
"github.com/devfile/devworkspace-operator/pkg/config"
2526
"github.com/devfile/devworkspace-operator/pkg/controller/workspace/env"
26-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2727
"github.com/google/go-cmp/cmp"
2828
"github.com/google/go-cmp/cmp/cmpopts"
2929
appsv1 "k8s.io/api/apps/v1"

‎pkg/controller/workspace/provision/pvc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
package provision
1414

1515
import (
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1617
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
1718
"github.com/devfile/devworkspace-operator/pkg/config"
18-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
1919
"github.com/go-logr/logr"
2020
corev1 "k8s.io/api/core/v1"
2121
"k8s.io/apimachinery/pkg/api/resource"

‎pkg/controller/workspace/provision/rbac.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
package provision
1414

1515
import (
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1617
"github.com/devfile/devworkspace-operator/pkg/config"
17-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
1818
"github.com/go-logr/logr"
1919
rbacv1 "k8s.io/api/rbac/v1"
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/controller/workspace/provision/routing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"context"
1717
"fmt"
1818

19+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1920
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/config"
21-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2222
"github.com/google/go-cmp/cmp"
2323
"github.com/google/go-cmp/cmp/cmpopts"
2424
"k8s.io/apimachinery/pkg/api/errors"

‎pkg/controller/workspace/provision/serviceaccount.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ package provision
1515
import (
1616
"context"
1717

18+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1819
"github.com/devfile/devworkspace-operator/pkg/common"
19-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2020
"github.com/google/go-cmp/cmp"
2121
corev1 "k8s.io/api/core/v1"
2222
"k8s.io/apimachinery/pkg/api/errors"

‎pkg/controller/workspace/restapis/component.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ package restapis
1515
import (
1616
"strings"
1717

18+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1819
controllerv1alpha1 "github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
1920
"github.com/devfile/devworkspace-operator/pkg/common"
2021
"github.com/devfile/devworkspace-operator/pkg/config"
21-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2222
corev1 "k8s.io/api/core/v1"
2323
)
2424

‎pkg/controller/workspace/restapis/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"context"
1717
"encoding/json"
1818

19+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1920
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/common"
2122
"github.com/devfile/devworkspace-operator/pkg/config"
2223
"github.com/devfile/devworkspace-operator/pkg/controller/workspace/provision"
23-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2424
"github.com/google/go-cmp/cmp"
2525
"github.com/google/go-cmp/cmp/cmpopts"
2626
"gopkg.in/yaml.v2"

‎pkg/controller/workspace/restapis/devfilev1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"strings"
1717

1818
//TODO
19+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1920
workspaceApi "github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/config"
21-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2222
)
2323

2424
func devworkspaceTemplateToDevfileV1(template *devworkspace.DevWorkspaceTemplateSpec) *workspaceApi.DevfileSpec {

‎pkg/controller/workspace/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323

2424
"github.com/go-logr/logr"
2525

26+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
2627
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2728
"github.com/devfile/devworkspace-operator/pkg/controller/workspace/provision"
28-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2929
corev1 "k8s.io/api/core/v1"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
kubeclock "k8s.io/apimachinery/pkg/util/clock"

‎pkg/controller/workspace/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ package workspace
1515
import (
1616
"fmt"
1717

18+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1819
"github.com/devfile/devworkspace-operator/pkg/config"
1920
"github.com/devfile/devworkspace-operator/pkg/webhook"
20-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2121
)
2222

2323
// validateCreatorTimestamp checks that a devworkspace was created after workspace-related mutating webhooks

‎pkg/controller/workspace/workspace_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import (
2121
"strings"
2222
"time"
2323

24+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
2425
"github.com/devfile/devworkspace-operator/internal/cluster"
2526
controllerv1alpha1 "github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2627
"github.com/devfile/devworkspace-operator/pkg/common"
2728
"github.com/devfile/devworkspace-operator/pkg/config"
2829
"github.com/devfile/devworkspace-operator/pkg/controller/workspace/provision"
2930
"github.com/devfile/devworkspace-operator/pkg/controller/workspace/restapis"
30-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
3131
"github.com/go-logr/logr"
3232
"github.com/google/uuid"
3333
"github.com/operator-framework/operator-sdk/pkg/k8sutil"

‎pkg/controller/workspacerouting/solvers/cluster_solver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717

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

20+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2122
"github.com/devfile/devworkspace-operator/pkg/config"
22-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2323
corev1 "k8s.io/api/core/v1"
2424
)
2525

‎pkg/controller/workspacerouting/solvers/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
package solvers
1414

1515
import (
16+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1617
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
1718
"github.com/devfile/devworkspace-operator/pkg/common"
1819
"github.com/devfile/devworkspace-operator/pkg/config"
19-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2020
routeV1 "github.com/openshift/api/route/v1"
2121
corev1 "k8s.io/api/core/v1"
2222
"k8s.io/api/extensions/v1beta1"

‎pkg/controller/workspacerouting/solvers/openshift_oauth_solver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ package solvers
1515
import (
1616
"fmt"
1717

18+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1819
"github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
1920
"github.com/devfile/devworkspace-operator/pkg/common"
2021
"github.com/devfile/devworkspace-operator/pkg/config"
21-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2222
oauthv1 "github.com/openshift/api/oauth/v1"
2323
routeV1 "github.com/openshift/api/route/v1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/controller/workspacerouting/solvers/resolve_endpoints.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"fmt"
1717
"net/url"
1818

19+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1920
controllerv1alpha1 "github.com/devfile/devworkspace-operator/pkg/apis/controller/v1alpha1"
2021
"github.com/devfile/devworkspace-operator/pkg/config"
21-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2222
)
2323

2424
func getExposedEndpoints(

‎webhook/workspace/handler/immutable.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"fmt"
1717
"reflect"
1818

19+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1920
"github.com/devfile/devworkspace-operator/pkg/config"
20-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2121
"github.com/google/go-cmp/cmp"
2222
"github.com/google/go-cmp/cmp/cmpopts"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎webhook/workspace/handler/workspace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"fmt"
1616
"net/http"
1717

18+
devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
1819
"github.com/devfile/devworkspace-operator/pkg/config"
19-
devworkspace "github.com/devfile/kubernetes-api/pkg/apis/workspaces/v1alpha1"
2020
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2121
)
2222

0 commit comments

Comments
 (0)