Merge "Move go packages to vino/pkg"

2021-01-15 21:32:07 +00:00 · 2021-01-15 21:32:07 +00:00 · 36b14784e1
commit 36b14784e1
parent 2abe17ecc8 31a1fc0ad9
8 changed files with 5 additions and 7 deletions
--- a/4
+++ b/4
@ -13,9 +13,7 @@ RUN go mod download

 # Copy the go source
 COPY main.go main.go
-COPY api api/
-COPY controllers controllers/
-
+COPY pkg pkg/

 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
--- a/main.go
+++ b/main.go
@ -29,8 +29,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"

-	vinov1 "vino/api/v1"
-	"vino/controllers"
+	vinov1 "vino/pkg/api/v1"
+	"vino/pkg/controllers"
 	// +kubebuilder:scaffold:imports
 )

--- a/pkg/api/v1/conditions.go
+++ b/pkg/api/v1/conditions.go
--- a/pkg/api/v1/groupversion_info.go
+++ b/pkg/api/v1/groupversion_info.go
--- a/pkg/api/v1/vino_types.go
+++ b/pkg/api/v1/vino_types.go
--- a/pkg/api/v1/zz_generated.deepcopy.go
+++ b/pkg/api/v1/zz_generated.deepcopy.go
--- a/pkg/controllers/suite_test.go
+++ b/pkg/controllers/suite_test.go
@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"

-	airshipv1 "vino/api/v1"
+	airshipv1 "vino/pkg/api/v1"
 	// +kubebuilder:scaffold:imports
 )

--- a/pkg/controllers/vino_controller.go
+++ b/pkg/controllers/vino_controller.go
@ -35,7 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/yaml"

-	vinov1 "vino/api/v1"
+	vinov1 "vino/pkg/api/v1"
 )

 const (