Skip to content

refactor: move cluster package outside of core #1367

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

Merged
wtrocki merged 1 commit into from
Jan 6, 2022
Merged

refactor: move cluster package outside of core #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 pkg/core/cluster/bind.go → pkg/cluster/bind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"crypto/rand"
"fmt"

"github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/color"
"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon"
"github.com/redhat-developer/app-services-cli/pkg/core/localize"
Expand Down
6 changes: 3 additions & 3 deletions pkg/core/cluster/clean.go → pkg/cluster/clean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package cluster

import (
"github.com/AlecAivazis/survey/v2"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon"
"github.com/redhat-developer/app-services-cli/pkg/core/localize"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
0 pkg/core/cluster/cluster.go → pkg/cluster/cluster.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions pkg/core/cluster/cluster_api.go → pkg/cluster/cluster_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package cluster

import (
"github.com/AlecAivazis/survey/v2"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
)

// KubernetesClusterAPIImpl implements KubernetesClusterAPI
Expand Down
8 changes: 4 additions & 4 deletions pkg/core/cluster/connect.go → pkg/cluster/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"fmt"
"time"

"github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/color"
"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon"
"github.com/redhat-developer/app-services-cli/pkg/core/localize"
Expand Down
0 pkg/core/cluster/constants/constants.go → pkg/cluster/constants/constants.go
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion pkg/core/cluster/kubeclient/kube_helpers.go → pkg/cluster/kubeclient/kube_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package kubeclient

import (
"fmt"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"

"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
3 changes: 2 additions & 1 deletion pkg/core/cluster/kubeclient/kubeclients.go → pkg/cluster/kubeclient/kubeclients.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package kubeclient

import (
"fmt"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"os"
"path/filepath"

"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"

"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
0 ...ore/cluster/services/custom_connection.go → pkg/cluster/services/custom_connection.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions pkg/core/cluster/services/kafka.go → pkg/cluster/services/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package services

import (
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/localize"
"github.com/redhat-developer/app-services-cli/pkg/kafkautil"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
0 ...ter/services/resources/KafkaConnection.go → ...ter/services/resources/KafkaConnection.go
View file
Open in desktop
File renamed without changes.
0 ...es/resources/ServiceRegistryConnection.go → ...es/resources/ServiceRegistryConnection.go
View file
Open in desktop
File renamed without changes.
0 ...cluster/services/resources/definitions.go → ...cluster/services/resources/definitions.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...core/cluster/services/service-registry.go → pkg/cluster/services/service-registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package services

import (
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster/constants"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/localize"
"github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/core/cluster/status.go → pkg/cluster/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cluster

import (
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
bindv1alpha1 "github.com/redhat-developer/service-binding-operator/apis/binding/v1alpha1"
)

Expand Down
0 pkg/core/cluster/v1alpha/cluster.go → pkg/cluster/v1alpha/cluster.go
View file
Open in desktop
File renamed without changes.
9 changes: 5 additions & 4 deletions pkg/cmd/cluster/bind/bind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package bind

import (
"context"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"

"github.com/redhat-developer/app-services-cli/pkg/cluster"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory"
"github.com/redhat-developer/app-services-cli/pkg/core/config"
"github.com/redhat-developer/app-services-cli/pkg/core/connection"
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/cluster/clean/clean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package clean
import (
"context"

"github.com/redhat-developer/app-services-cli/pkg/core/cluster"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory"
"github.com/redhat-developer/app-services-cli/pkg/core/config"
"github.com/redhat-developer/app-services-cli/pkg/core/connection"
Expand Down
9 changes: 5 additions & 4 deletions pkg/cmd/cluster/connect/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package connect

import (
"context"

"github.com/redhat-developer/app-services-cli/internal/build"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/cluster"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory"
"github.com/redhat-developer/app-services-cli/pkg/core/config"
"github.com/redhat-developer/app-services-cli/pkg/core/connection"
Expand Down
7 changes: 4 additions & 3 deletions pkg/cmd/cluster/status/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package status
import (
"context"
"fmt"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha"

"github.com/redhat-developer/app-services-cli/pkg/cluster"
"github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient"
"github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha"
"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory"
"github.com/redhat-developer/app-services-cli/pkg/core/config"
"github.com/redhat-developer/app-services-cli/pkg/core/connection"
Expand Down