Move v1alpha1 api to apis package from kubeserial package

janekbaraniewski · Jun 3, 2022 · 0ff76a0 · 0ff76a0
1 parent c0f620d
commit 0ff76a0
Show file tree

Hide file tree

Showing 64 changed files with 111 additions and 111 deletions.
diff --git a/PROJECT b/PROJECT
@@ -11,7 +11,7 @@ resources:
   domain: app.kubeserial.com
   group: kubeserial
   kind: KubeSerial
-  path: github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1
+  path: github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/janekbaraniewski/kubeserial/pkg/controllers"
 	//+kubebuilder:scaffold:imports
 )

diff --git a/hack/code-gen.sh b/hack/code-gen.sh
@@ -26,35 +26,35 @@ printf "deepcopy-gen... "
 
 deepcopy-gen \
   --go-header-file "hack/boilerplate.go.txt" \
-  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
-  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
+  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
+  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
   --output-file-base=zz_generated.deepcopy -v 1
 
-replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1/zz_generated.deepcopy.go ./pkg/apis/kubeserial/v1alpha1/zz_generated.deepcopy.go
+replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1/zz_generated.deepcopy.go ./pkg/apis/v1alpha1/zz_generated.deepcopy.go
 
 printf "Done!\n"
 
 printf "register-gen... "
 
 register-gen all \
   --go-header-file "hack/boilerplate.go.txt" \
-  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
-  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
+  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
+  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
   --output-file-base=zz_generated.register -v 1
 
-replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1/zz_generated.register.go ./pkg/apis/kubeserial/v1alpha1/zz_generated.register.go
+replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1/zz_generated.register.go ./pkg/apis/v1alpha1/zz_generated.register.go
 
 printf "Done!\n"
 
 printf "openapi-gen... "
 
 openapi-gen \
   --go-header-file "hack/boilerplate.go.txt" \
-  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
-  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
+  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
+  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
   --output-file-base=zz_generated.openapi -v 1
 
-replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1/zz_generated.openapi.go ./pkg/apis/kubeserial/v1alpha1/zz_generated.openapi.go
+replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1/zz_generated.openapi.go ./pkg/apis/v1alpha1/zz_generated.openapi.go
 
 printf "Done!\n"
 
@@ -63,7 +63,7 @@ printf "client-gen... "
 client-gen \
     --go-header-file "hack/boilerplate.go.txt" \
     --input-base="" \
-    --input="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
+    --input="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
     --output-package=github.com/janekbaraniewski/kubeserial/pkg/generated/clientset \
     --clientset-name=versioned
 
@@ -73,15 +73,15 @@ printf "lister-gen... "
 
 lister-gen \
     --go-header-file "hack/boilerplate.go.txt" \
-    --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
+    --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
     --output-package=github.com/janekbaraniewski/kubeserial/pkg/generated/listers
 printf "Done!\n"
 
 printf "informer-gen... "
 
 informer-gen \
     --go-header-file "hack/boilerplate.go.txt" \
-    --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" \
+    --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
     --versioned-clientset-package=github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned \
     --listers-package=github.com/janekbaraniewski/kubeserial/pkg/generated/listers \
     --output-package=github.com/janekbaraniewski/kubeserial/pkg/generated/informers

diff --git a/hack/manifests-gen.sh b/hack/manifests-gen.sh
@@ -27,7 +27,7 @@ GO111MODULE=on "$GO" install \
 
 printf "controller-gen CRD... "
 
-controller-gen rbac:roleName=manager-role crd paths=./pkg/apis/kubeserial/... output:crd:dir=/tmp/deploy/crds
+controller-gen rbac:roleName=manager-role crd paths=./pkg/apis/... output:crd:dir=/tmp/deploy/crds
 find /tmp/deploy/crds -name "*.yaml" | xargs -I % python3 ./hack/update-crd-metadata.py % ./hack/crd_metadata_template.yaml
 find /tmp/deploy/crds -name "*.yaml" | xargs ${sed} -i 's/\x27{{/{{/g'  # change '{{ -> {{
 find /tmp/deploy/crds -name "*.yaml" | xargs ${sed} -i 's/}}\x27/}}/g' # change }}' -> }}

diff --git a/pkg/apis/kubeserial/v1alpha1/device.go → pkg/apis/v1alpha1/device.go b/pkg/apis/kubeserial/v1alpha1/device.go → pkg/apis/v1alpha1/device.go
diff --git a/pkg/apis/kubeserial/v1alpha1/doc.go → pkg/apis/v1alpha1/doc.go b/pkg/apis/kubeserial/v1alpha1/doc.go → pkg/apis/v1alpha1/doc.go
diff --git a/pkg/apis/kubeserial/v1alpha1/kubeserial.go → pkg/apis/v1alpha1/kubeserial.go b/pkg/apis/kubeserial/v1alpha1/kubeserial.go → pkg/apis/v1alpha1/kubeserial.go
diff --git a/pkg/apis/kubeserial/v1alpha1/manager.go → pkg/apis/v1alpha1/manager.go b/pkg/apis/kubeserial/v1alpha1/manager.go → pkg/apis/v1alpha1/manager.go
diff --git a/...serial/v1alpha1/managerschedulerequest.go → pkg/apis/v1alpha1/managerschedulerequest.go b/...serial/v1alpha1/managerschedulerequest.go → pkg/apis/v1alpha1/managerschedulerequest.go
diff --git a/...eserial/v1alpha1/zz_generated.deepcopy.go → pkg/apis/v1alpha1/zz_generated.deepcopy.go b/...eserial/v1alpha1/zz_generated.deepcopy.go → pkg/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/...beserial/v1alpha1/zz_generated.openapi.go → pkg/apis/v1alpha1/zz_generated.openapi.go b/...beserial/v1alpha1/zz_generated.openapi.go → pkg/apis/v1alpha1/zz_generated.openapi.go
diff --git a/...eserial/v1alpha1/zz_generated.register.go → pkg/apis/v1alpha1/zz_generated.register.go b/...eserial/v1alpha1/zz_generated.register.go → pkg/apis/v1alpha1/zz_generated.register.go
diff --git a/pkg/controllers/api/api_test.go b/pkg/controllers/api/api_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

diff --git a/pkg/controllers/device_controller.go b/pkg/controllers/device_controller.go
@@ -29,7 +29,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/janekbaraniewski/kubeserial/pkg/controllers/api"
 	"github.com/janekbaraniewski/kubeserial/pkg/gateway"
 )

diff --git a/pkg/controllers/device_controller_test.go b/pkg/controllers/device_controller_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	"github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/controllers/integration_tests/suite_test.go b/pkg/controllers/integration_tests/suite_test.go
@@ -36,7 +36,7 @@ package integration_tests
 // 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 // 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-// 	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+// 	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 // 	"github.com/janekbaraniewski/kubeserial/pkg/controllers"
 // 	//+kubebuilder:scaffold:imports
 // )

diff --git a/pkg/controllers/kubeserial_controller.go b/pkg/controllers/kubeserial_controller.go
@@ -27,7 +27,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/janekbaraniewski/kubeserial/pkg/controllers/api"
 	"github.com/janekbaraniewski/kubeserial/pkg/monitor"
 )

diff --git a/pkg/controllers/kubeserial_controller_test.go b/pkg/controllers/kubeserial_controller_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/janekbaraniewski/kubeserial/pkg/controllers/api"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/controllers/managerschedulerequest_controller.go b/pkg/controllers/managerschedulerequest_controller.go
@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/janekbaraniewski/kubeserial/pkg/controllers/api"
 	"github.com/janekbaraniewski/kubeserial/pkg/managers"
 )

diff --git a/pkg/controllers/managerschedulerequest_controller_test.go b/pkg/controllers/managerschedulerequest_controller_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	"github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"

diff --git a/pkg/gateway/cm_test.go b/pkg/gateway/cm_test.go
@@ -3,7 +3,7 @@ package gateway
 import (
 	"testing"
 
-	"github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1"
+	"github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )