airship/airshipctl
Code Issues Proposed changes

Move clusterctl api structs to gloabal api module

Browse Source 
Change-Id: I4cd707d286ddac7cdc4aadc66b8257e413e231aa
Closes: #269
This commit is contained in:
Dmitry Ukov 2020-06-08 19:28:36 +04:00
parent be8ea35e6c
commit efec7ec5e1
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/clusterctl/api/v1alpha1/clusterctl_types.go → pkg/api/v1alpha1/clusterctl_types.go
View File

@ -12,7 +12,7 @@
limitations under the License. limitations under the License.
*/ */
package clusterctl package v1alpha1
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/clusterctl/api/v1alpha1/clusterctl_types_test.go → pkg/api/v1alpha1/clusterctl_types_test.go
View File

@ -12,7 +12,7 @@
limitations under the License. limitations under the License.
*/ */
package clusterctl package v1alpha1
import ( import (
"testing" "testing"

2
pkg/clusterctl/client/client.go
View File

@ -19,7 +19,7 @@ import (
clusterctlconfig "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config" clusterctlconfig "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
clog "sigs.k8s.io/cluster-api/cmd/clusterctl/log" clog "sigs.k8s.io/cluster-api/cmd/clusterctl/log"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
"opendev.org/airship/airshipctl/pkg/clusterctl/implementations" "opendev.org/airship/airshipctl/pkg/clusterctl/implementations"
"opendev.org/airship/airshipctl/pkg/log" "opendev.org/airship/airshipctl/pkg/log"
) )

2
pkg/clusterctl/client/client_test.go
View File

@ -22,7 +22,7 @@ import (
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3" clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
) )
var ( var (

2
pkg/clusterctl/client/factory.go
View File

@ -20,7 +20,7 @@ import (
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config" "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository" "sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
"opendev.org/airship/airshipctl/pkg/clusterctl/implementations" "opendev.org/airship/airshipctl/pkg/clusterctl/implementations"
"opendev.org/airship/airshipctl/pkg/log" "opendev.org/airship/airshipctl/pkg/log"
) )

2
pkg/clusterctl/client/factory_test.go
View File

@ -27,7 +27,7 @@ import (
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository" "sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
) )
const ( const (

2
pkg/clusterctl/cmd/command.go
View File

@ -17,7 +17,7 @@ package cmd
import ( import (
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
"opendev.org/airship/airshipctl/pkg/clusterctl/client" "opendev.org/airship/airshipctl/pkg/clusterctl/client"
"opendev.org/airship/airshipctl/pkg/config" "opendev.org/airship/airshipctl/pkg/config"
"opendev.org/airship/airshipctl/pkg/document" "opendev.org/airship/airshipctl/pkg/document"

2
pkg/clusterctl/implementations/reader.go
View File

@ -19,7 +19,7 @@ import (
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config" "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
) )
var _ config.Reader = &AirshipReader{} var _ config.Reader = &AirshipReader{}

2
pkg/clusterctl/implementations/reader_test.go
View File

@ -22,7 +22,7 @@ import (
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3" clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config" "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
) )
func makeValidOptions() *airshipv1.Clusterctl { func makeValidOptions() *airshipv1.Clusterctl {

2
pkg/clusterctl/implementations/repository_client_test.go
View File

@ -23,7 +23,7 @@ import (
clusterctlconfig "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config" clusterctlconfig "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository" "sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
) )
func TestRepositoryClient(t *testing.T) { func TestRepositoryClient(t *testing.T) {

2
pkg/document/selectors.go
View File

@ -21,7 +21,7 @@ import (
"sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resid"
"sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/types"
airshipv1 "opendev.org/airship/airshipctl/pkg/clusterctl/api/v1alpha1" airshipv1 "opendev.org/airship/airshipctl/pkg/api/v1alpha1"
) )
// Selector provides abstraction layer in front of kustomize selector // Selector provides abstraction layer in front of kustomize selector