diff --git a/PROJECT b/PROJECT index 2b453551..0c1a5148 100644 --- 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 index 90e38456..ed8d06fd 100644 --- 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 index 5cf79cac..b66b163a 100755 --- a/hack/code-gen.sh +++ b/hack/code-gen.sh @@ -26,11 +26,11 @@ 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" @@ -38,11 +38,11 @@ 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" @@ -50,11 +50,11 @@ 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,7 +73,7 @@ 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" @@ -81,7 +81,7 @@ 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 index f5df1f0b..09df3cf0 100755 --- 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 b/pkg/apis/v1alpha1/device.go similarity index 100% rename from pkg/apis/kubeserial/v1alpha1/device.go rename to pkg/apis/v1alpha1/device.go diff --git a/pkg/apis/kubeserial/v1alpha1/doc.go b/pkg/apis/v1alpha1/doc.go similarity index 100% rename from pkg/apis/kubeserial/v1alpha1/doc.go rename to pkg/apis/v1alpha1/doc.go diff --git a/pkg/apis/kubeserial/v1alpha1/kubeserial.go b/pkg/apis/v1alpha1/kubeserial.go similarity index 100% rename from pkg/apis/kubeserial/v1alpha1/kubeserial.go rename to pkg/apis/v1alpha1/kubeserial.go diff --git a/pkg/apis/kubeserial/v1alpha1/manager.go b/pkg/apis/v1alpha1/manager.go similarity index 100% rename from pkg/apis/kubeserial/v1alpha1/manager.go rename to pkg/apis/v1alpha1/manager.go diff --git a/pkg/apis/kubeserial/v1alpha1/managerschedulerequest.go b/pkg/apis/v1alpha1/managerschedulerequest.go similarity index 100% rename from pkg/apis/kubeserial/v1alpha1/managerschedulerequest.go rename to pkg/apis/v1alpha1/managerschedulerequest.go diff --git a/pkg/apis/kubeserial/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/kubeserial/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/kubeserial/v1alpha1/zz_generated.openapi.go b/pkg/apis/v1alpha1/zz_generated.openapi.go similarity index 75% rename from pkg/apis/kubeserial/v1alpha1/zz_generated.openapi.go rename to pkg/apis/v1alpha1/zz_generated.openapi.go index 9f74092c..2d13c66f 100644 --- a/pkg/apis/kubeserial/v1alpha1/zz_generated.openapi.go +++ b/pkg/apis/v1alpha1/zz_generated.openapi.go @@ -29,21 +29,21 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.IngressSpec": schema_pkg_apis_kubeserial_v1alpha1_IngressSpec(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.KubeSerial": schema_pkg_apis_kubeserial_v1alpha1_KubeSerial(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.KubeSerialSpec": schema_pkg_apis_kubeserial_v1alpha1_KubeSerialSpec(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.KubeSerialStatus": schema_pkg_apis_kubeserial_v1alpha1_KubeSerialStatus(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.ManagerScheduleRequestSpec": schema_pkg_apis_kubeserial_v1alpha1_ManagerScheduleRequestSpec(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.ManagerScheduleRequestStatus": schema_pkg_apis_kubeserial_v1alpha1_ManagerScheduleRequestStatus(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.ManagerSpec": schema_pkg_apis_kubeserial_v1alpha1_ManagerSpec(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.ManagerStatus": schema_pkg_apis_kubeserial_v1alpha1_ManagerStatus(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.SerialDeviceSpec": schema_pkg_apis_kubeserial_v1alpha1_SerialDeviceSpec(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.SerialDeviceStatus": schema_pkg_apis_kubeserial_v1alpha1_SerialDeviceStatus(ref), - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.SerialDevice_2": schema_pkg_apis_kubeserial_v1alpha1_SerialDevice_2(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.IngressSpec": schema_kubeserial_pkg_apis_v1alpha1_IngressSpec(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.KubeSerial": schema_kubeserial_pkg_apis_v1alpha1_KubeSerial(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.KubeSerialSpec": schema_kubeserial_pkg_apis_v1alpha1_KubeSerialSpec(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.KubeSerialStatus": schema_kubeserial_pkg_apis_v1alpha1_KubeSerialStatus(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.ManagerScheduleRequestSpec": schema_kubeserial_pkg_apis_v1alpha1_ManagerScheduleRequestSpec(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.ManagerScheduleRequestStatus": schema_kubeserial_pkg_apis_v1alpha1_ManagerScheduleRequestStatus(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.ManagerSpec": schema_kubeserial_pkg_apis_v1alpha1_ManagerSpec(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.ManagerStatus": schema_kubeserial_pkg_apis_v1alpha1_ManagerStatus(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.SerialDeviceSpec": schema_kubeserial_pkg_apis_v1alpha1_SerialDeviceSpec(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.SerialDeviceStatus": schema_kubeserial_pkg_apis_v1alpha1_SerialDeviceStatus(ref), + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.SerialDevice_2": schema_kubeserial_pkg_apis_v1alpha1_SerialDevice_2(ref), } } -func schema_pkg_apis_kubeserial_v1alpha1_IngressSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_IngressSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -85,7 +85,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_IngressSpec(ref common.ReferenceCallbac } } -func schema_pkg_apis_kubeserial_v1alpha1_KubeSerial(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_KubeSerial(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -115,13 +115,13 @@ func schema_pkg_apis_kubeserial_v1alpha1_KubeSerial(ref common.ReferenceCallback "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.KubeSerialSpec"), + Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.KubeSerialSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.KubeSerialStatus"), + Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.KubeSerialStatus"), }, }, }, @@ -129,11 +129,11 @@ func schema_pkg_apis_kubeserial_v1alpha1_KubeSerial(ref common.ReferenceCallback }, }, Dependencies: []string{ - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.KubeSerialSpec", "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.KubeSerialStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.KubeSerialSpec", "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.KubeSerialStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_kubeserial_v1alpha1_KubeSerialSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_KubeSerialSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -147,7 +147,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_KubeSerialSpec(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.SerialDevice_2"), + Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.SerialDevice_2"), }, }, }, @@ -156,7 +156,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_KubeSerialSpec(ref common.ReferenceCall "ingress": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.IngressSpec"), + Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.IngressSpec"), }, }, }, @@ -164,11 +164,11 @@ func schema_pkg_apis_kubeserial_v1alpha1_KubeSerialSpec(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.IngressSpec", "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.SerialDevice_2"}, + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.IngressSpec", "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.SerialDevice_2"}, } } -func schema_pkg_apis_kubeserial_v1alpha1_KubeSerialStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_KubeSerialStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -179,7 +179,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_KubeSerialStatus(ref common.ReferenceCa } } -func schema_pkg_apis_kubeserial_v1alpha1_ManagerScheduleRequestSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_ManagerScheduleRequestSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -207,7 +207,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_ManagerScheduleRequestSpec(ref common.R } } -func schema_pkg_apis_kubeserial_v1alpha1_ManagerScheduleRequestStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_ManagerScheduleRequestStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -228,7 +228,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_ManagerScheduleRequestStatus(ref common } } -func schema_pkg_apis_kubeserial_v1alpha1_ManagerSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_ManagerSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -238,7 +238,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_ManagerSpec(ref common.ReferenceCallbac "image": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.Image"), + Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.Image"), }, }, "runCmd": { @@ -267,11 +267,11 @@ func schema_pkg_apis_kubeserial_v1alpha1_ManagerSpec(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.Image"}, + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.Image"}, } } -func schema_pkg_apis_kubeserial_v1alpha1_ManagerStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_ManagerStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -282,7 +282,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_ManagerStatus(ref common.ReferenceCallb } } -func schema_pkg_apis_kubeserial_v1alpha1_SerialDeviceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_SerialDeviceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -323,7 +323,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_SerialDeviceSpec(ref common.ReferenceCa } } -func schema_pkg_apis_kubeserial_v1alpha1_SerialDeviceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_SerialDeviceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -337,7 +337,7 @@ func schema_pkg_apis_kubeserial_v1alpha1_SerialDeviceStatus(ref common.Reference Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.SerialDeviceCondition"), + Ref: ref("github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.SerialDeviceCondition"), }, }, }, @@ -354,11 +354,11 @@ func schema_pkg_apis_kubeserial_v1alpha1_SerialDeviceStatus(ref common.Reference }, }, Dependencies: []string{ - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1.SerialDeviceCondition"}, + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1.SerialDeviceCondition"}, } } -func schema_pkg_apis_kubeserial_v1alpha1_SerialDevice_2(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubeserial_pkg_apis_v1alpha1_SerialDevice_2(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/pkg/apis/kubeserial/v1alpha1/zz_generated.register.go b/pkg/apis/v1alpha1/zz_generated.register.go similarity index 100% rename from pkg/apis/kubeserial/v1alpha1/zz_generated.register.go rename to pkg/apis/v1alpha1/zz_generated.register.go diff --git a/pkg/controllers/api/api_test.go b/pkg/controllers/api/api_test.go index f709009c..67c9b75e 100644 --- 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 index d9257b88..e27374f4 100644 --- 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 index 9d6e8351..5b008bd1 100644 --- 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 index d220401c..1e388ac1 100644 --- 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 index 1661a362..ccc4bd36 100644 --- 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 index c02c16ba..9ec3fd83 100644 --- 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 index 4254981a..252fec2e 100644 --- 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 index 35cd3691..82408d73 100644 --- 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 index 9bc88cae..33e4413c 100644 --- 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" ) diff --git a/pkg/gateway/deployment_test.go b/pkg/gateway/deployment_test.go index 092fe52c..b11a3212 100644 --- a/pkg/gateway/deployment_test.go +++ b/pkg/gateway/deployment_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" ) diff --git a/pkg/gateway/deploymet.go b/pkg/gateway/deploymet.go index 4af4f5bc..407b629b 100644 --- a/pkg/gateway/deploymet.go +++ b/pkg/gateway/deploymet.go @@ -3,7 +3,7 @@ package gateway import ( "strings" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/gateway/svc.go b/pkg/gateway/svc.go index 51fcc057..b756ca21 100644 --- a/pkg/gateway/svc.go +++ b/pkg/gateway/svc.go @@ -3,7 +3,7 @@ package gateway import ( "strings" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/gateway/svc_test.go b/pkg/gateway/svc_test.go index a783d293..af1f7894 100644 --- a/pkg/gateway/svc_test.go +++ b/pkg/gateway/svc_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" ) diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index 3c636bd4..02718c33 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ import ( "fmt" "net/http" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/apis/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go index 5765c13c..4a525a86 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -19,8 +19,8 @@ package fake import ( clientset "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1" - fakeappv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/apis/v1alpha1" + fakeappv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index 074da3cc..c2ccd7aa 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -18,7 +18,7 @@ limitations under the License. package fake import ( - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index 5ebc28ef..1d9c1e4c 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -18,7 +18,7 @@ limitations under the License. package scheme import ( - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/kubeserial_client.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/apis_client.go similarity index 97% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/kubeserial_client.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/apis_client.go index 40144cb3..2fc6f19a 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/kubeserial_client.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/apis_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/doc.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/doc.go similarity index 100% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/doc.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/doc.go diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/doc.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/doc.go similarity index 100% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/doc.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/doc.go diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_kubeserial_client.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_apis_client.go similarity index 97% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_kubeserial_client.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_apis_client.go index f4b37993..6749feab 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_kubeserial_client.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_apis_client.go @@ -18,7 +18,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/apis/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_kubeserial.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_kubeserial.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_kubeserial.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_kubeserial.go index 84ab9ac3..f11387fa 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_kubeserial.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_kubeserial.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_manager.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_manager.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_manager.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_manager.go index 67f7badb..8318c479 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_manager.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_manager.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_managerschedulerequest.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_managerschedulerequest.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_managerschedulerequest.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_managerschedulerequest.go index c3074483..fc7a0a92 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_managerschedulerequest.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_managerschedulerequest.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_serialdevice.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_serialdevice.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_serialdevice.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_serialdevice.go index da5a1fd0..7390e084 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/fake/fake_serialdevice.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake/fake_serialdevice.go @@ -20,7 +20,7 @@ package fake import ( "context" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/generated_expansion.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/generated_expansion.go similarity index 100% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/generated_expansion.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/generated_expansion.go diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/kubeserial.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/kubeserial.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/kubeserial.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/kubeserial.go index d16a70cc..e7d4e9e6 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/kubeserial.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/kubeserial.go @@ -21,7 +21,7 @@ import ( "context" "time" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" scheme "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/manager.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/manager.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/manager.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/manager.go index 4e1f123e..effe7237 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/manager.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/manager.go @@ -21,7 +21,7 @@ import ( "context" "time" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" scheme "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/managerschedulerequest.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/managerschedulerequest.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/managerschedulerequest.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/managerschedulerequest.go index f1aa95e5..197f7c81 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/managerschedulerequest.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/managerschedulerequest.go @@ -21,7 +21,7 @@ import ( "context" "time" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" scheme "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/serialdevice.go b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/serialdevice.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/serialdevice.go rename to pkg/generated/clientset/versioned/typed/apis/v1alpha1/serialdevice.go index 108b1752..cc3b7372 100644 --- a/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1/serialdevice.go +++ b/pkg/generated/clientset/versioned/typed/apis/v1alpha1/serialdevice.go @@ -21,7 +21,7 @@ import ( "context" "time" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" scheme "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/generated/informers/externalversions/kubeserial/interface.go b/pkg/generated/informers/externalversions/apis/interface.go similarity index 95% rename from pkg/generated/informers/externalversions/kubeserial/interface.go rename to pkg/generated/informers/externalversions/apis/interface.go index 399f8a34..111a6489 100644 --- a/pkg/generated/informers/externalversions/kubeserial/interface.go +++ b/pkg/generated/informers/externalversions/apis/interface.go @@ -15,11 +15,11 @@ limitations under the License. */ // Code generated by informer-gen. DO NOT EDIT. -package kubeserial +package apis import ( + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/apis/v1alpha1" internalinterfaces "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/kubeserial/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/interface.go b/pkg/generated/informers/externalversions/apis/v1alpha1/interface.go similarity index 100% rename from pkg/generated/informers/externalversions/kubeserial/v1alpha1/interface.go rename to pkg/generated/informers/externalversions/apis/v1alpha1/interface.go diff --git a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/kubeserial.go b/pkg/generated/informers/externalversions/apis/v1alpha1/kubeserial.go similarity index 93% rename from pkg/generated/informers/externalversions/kubeserial/v1alpha1/kubeserial.go rename to pkg/generated/informers/externalversions/apis/v1alpha1/kubeserial.go index 4f28e25e..a9f9049c 100644 --- a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/kubeserial.go +++ b/pkg/generated/informers/externalversions/apis/v1alpha1/kubeserial.go @@ -21,10 +21,10 @@ import ( "context" time "time" - kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + apisv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" versioned "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" internalinterfaces "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -70,7 +70,7 @@ func NewFilteredKubeSerialInformer(client versioned.Interface, namespace string, return client.AppV1alpha1().KubeSerials(namespace).Watch(context.TODO(), options) }, }, - &kubeserialv1alpha1.KubeSerial{}, + &apisv1alpha1.KubeSerial{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *kubeSerialInformer) defaultInformer(client versioned.Interface, resyncP } func (f *kubeSerialInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kubeserialv1alpha1.KubeSerial{}, f.defaultInformer) + return f.factory.InformerFor(&apisv1alpha1.KubeSerial{}, f.defaultInformer) } func (f *kubeSerialInformer) Lister() v1alpha1.KubeSerialLister { diff --git a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/manager.go b/pkg/generated/informers/externalversions/apis/v1alpha1/manager.go similarity index 93% rename from pkg/generated/informers/externalversions/kubeserial/v1alpha1/manager.go rename to pkg/generated/informers/externalversions/apis/v1alpha1/manager.go index 652d5dde..dbdf3817 100644 --- a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/manager.go +++ b/pkg/generated/informers/externalversions/apis/v1alpha1/manager.go @@ -21,10 +21,10 @@ import ( "context" time "time" - kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + apisv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" versioned "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" internalinterfaces "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -70,7 +70,7 @@ func NewFilteredManagerInformer(client versioned.Interface, namespace string, re return client.AppV1alpha1().Managers(namespace).Watch(context.TODO(), options) }, }, - &kubeserialv1alpha1.Manager{}, + &apisv1alpha1.Manager{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *managerInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *managerInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kubeserialv1alpha1.Manager{}, f.defaultInformer) + return f.factory.InformerFor(&apisv1alpha1.Manager{}, f.defaultInformer) } func (f *managerInformer) Lister() v1alpha1.ManagerLister { diff --git a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/managerschedulerequest.go b/pkg/generated/informers/externalversions/apis/v1alpha1/managerschedulerequest.go similarity index 93% rename from pkg/generated/informers/externalversions/kubeserial/v1alpha1/managerschedulerequest.go rename to pkg/generated/informers/externalversions/apis/v1alpha1/managerschedulerequest.go index fcd2ac1f..36b9a7fb 100644 --- a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/managerschedulerequest.go +++ b/pkg/generated/informers/externalversions/apis/v1alpha1/managerschedulerequest.go @@ -21,10 +21,10 @@ import ( "context" time "time" - kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + apisv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" versioned "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" internalinterfaces "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -70,7 +70,7 @@ func NewFilteredManagerScheduleRequestInformer(client versioned.Interface, names return client.AppV1alpha1().ManagerScheduleRequests(namespace).Watch(context.TODO(), options) }, }, - &kubeserialv1alpha1.ManagerScheduleRequest{}, + &apisv1alpha1.ManagerScheduleRequest{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *managerScheduleRequestInformer) defaultInformer(client versioned.Interf } func (f *managerScheduleRequestInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kubeserialv1alpha1.ManagerScheduleRequest{}, f.defaultInformer) + return f.factory.InformerFor(&apisv1alpha1.ManagerScheduleRequest{}, f.defaultInformer) } func (f *managerScheduleRequestInformer) Lister() v1alpha1.ManagerScheduleRequestLister { diff --git a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/serialdevice.go b/pkg/generated/informers/externalversions/apis/v1alpha1/serialdevice.go similarity index 93% rename from pkg/generated/informers/externalversions/kubeserial/v1alpha1/serialdevice.go rename to pkg/generated/informers/externalversions/apis/v1alpha1/serialdevice.go index 289bf8b2..03910431 100644 --- a/pkg/generated/informers/externalversions/kubeserial/v1alpha1/serialdevice.go +++ b/pkg/generated/informers/externalversions/apis/v1alpha1/serialdevice.go @@ -21,10 +21,10 @@ import ( "context" time "time" - kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + apisv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" versioned "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" internalinterfaces "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/generated/listers/apis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -69,7 +69,7 @@ func NewFilteredSerialDeviceInformer(client versioned.Interface, resyncPeriod ti return client.AppV1alpha1().SerialDevices().Watch(context.TODO(), options) }, }, - &kubeserialv1alpha1.SerialDevice{}, + &apisv1alpha1.SerialDevice{}, resyncPeriod, indexers, ) @@ -80,7 +80,7 @@ func (f *serialDeviceInformer) defaultInformer(client versioned.Interface, resyn } func (f *serialDeviceInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kubeserialv1alpha1.SerialDevice{}, f.defaultInformer) + return f.factory.InformerFor(&apisv1alpha1.SerialDevice{}, f.defaultInformer) } func (f *serialDeviceInformer) Lister() v1alpha1.SerialDeviceLister { diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go index 90252d89..48d5d198 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -23,8 +23,8 @@ import ( time "time" versioned "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" + apis "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/apis" internalinterfaces "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/internalinterfaces" - kubeserial "github.com/janekbaraniewski/kubeserial/pkg/generated/informers/externalversions/kubeserial" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -171,9 +171,9 @@ type SharedInformerFactory interface { ForResource(resource schema.GroupVersionResource) (GenericInformer, error) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - App() kubeserial.Interface + App() apis.Interface } -func (f *sharedInformerFactory) App() kubeserial.Interface { - return kubeserial.New(f, f.namespace, f.tweakListOptions) +func (f *sharedInformerFactory) App() apis.Interface { + return apis.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index 2b7d3286..206c8224 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -20,7 +20,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/generated/listers/kubeserial/v1alpha1/expansion_generated.go b/pkg/generated/listers/apis/v1alpha1/expansion_generated.go similarity index 100% rename from pkg/generated/listers/kubeserial/v1alpha1/expansion_generated.go rename to pkg/generated/listers/apis/v1alpha1/expansion_generated.go diff --git a/pkg/generated/listers/kubeserial/v1alpha1/kubeserial.go b/pkg/generated/listers/apis/v1alpha1/kubeserial.go similarity index 97% rename from pkg/generated/listers/kubeserial/v1alpha1/kubeserial.go rename to pkg/generated/listers/apis/v1alpha1/kubeserial.go index 50f718da..beca8c44 100644 --- a/pkg/generated/listers/kubeserial/v1alpha1/kubeserial.go +++ b/pkg/generated/listers/apis/v1alpha1/kubeserial.go @@ -18,7 +18,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/kubeserial/v1alpha1/manager.go b/pkg/generated/listers/apis/v1alpha1/manager.go similarity index 97% rename from pkg/generated/listers/kubeserial/v1alpha1/manager.go rename to pkg/generated/listers/apis/v1alpha1/manager.go index 2c65bbcc..320715be 100644 --- a/pkg/generated/listers/kubeserial/v1alpha1/manager.go +++ b/pkg/generated/listers/apis/v1alpha1/manager.go @@ -18,7 +18,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/kubeserial/v1alpha1/managerschedulerequest.go b/pkg/generated/listers/apis/v1alpha1/managerschedulerequest.go similarity index 98% rename from pkg/generated/listers/kubeserial/v1alpha1/managerschedulerequest.go rename to pkg/generated/listers/apis/v1alpha1/managerschedulerequest.go index f4c8ccee..804e8c40 100644 --- a/pkg/generated/listers/kubeserial/v1alpha1/managerschedulerequest.go +++ b/pkg/generated/listers/apis/v1alpha1/managerschedulerequest.go @@ -18,7 +18,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/kubeserial/v1alpha1/serialdevice.go b/pkg/generated/listers/apis/v1alpha1/serialdevice.go similarity index 96% rename from pkg/generated/listers/kubeserial/v1alpha1/serialdevice.go rename to pkg/generated/listers/apis/v1alpha1/serialdevice.go index b7175db6..cd2b2db6 100644 --- a/pkg/generated/listers/kubeserial/v1alpha1/serialdevice.go +++ b/pkg/generated/listers/apis/v1alpha1/serialdevice.go @@ -18,7 +18,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + v1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/managers/ingress.go b/pkg/managers/ingress.go index 857c81e5..906f7778 100644 --- a/pkg/managers/ingress.go +++ b/pkg/managers/ingress.go @@ -3,7 +3,7 @@ package managers import ( "strings" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/managers/manager.go b/pkg/managers/manager.go index 4a8187c9..2f9c62d5 100644 --- a/pkg/managers/manager.go +++ b/pkg/managers/manager.go @@ -3,7 +3,7 @@ package managers import ( "context" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "github.com/janekbaraniewski/kubeserial/pkg/controllers/api" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/monitor/cm.go b/pkg/monitor/cm.go index b63b3dfe..7864e7b1 100644 --- a/pkg/monitor/cm.go +++ b/pkg/monitor/cm.go @@ -3,7 +3,7 @@ package monitor import ( "fmt" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/monitor/cm_test.go b/pkg/monitor/cm_test.go index aa6d2c15..65c1c320 100644 --- a/pkg/monitor/cm_test.go +++ b/pkg/monitor/cm_test.go @@ -3,7 +3,7 @@ package monitor import ( "testing" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "github.com/stretchr/testify/assert" ) diff --git a/pkg/monitor/ds.go b/pkg/monitor/ds.go index 8c26986d..be59812b 100644 --- a/pkg/monitor/ds.go +++ b/pkg/monitor/ds.go @@ -3,7 +3,7 @@ package monitor import ( "fmt" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/monitor/ds_test.go b/pkg/monitor/ds_test.go index d9978654..79bce5f6 100644 --- a/pkg/monitor/ds_test.go +++ b/pkg/monitor/ds_test.go @@ -3,7 +3,7 @@ package monitor import ( "testing" - appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + appv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "github.com/stretchr/testify/assert" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/monitor/monitor.go b/pkg/monitor/monitor.go index afbaf1c2..42e18b34 100644 --- a/pkg/monitor/monitor.go +++ b/pkg/monitor/monitor.go @@ -10,7 +10,7 @@ import ( v1 "k8s.io/client-go/kubernetes/typed/core/v1" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" v1alpha1client "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/typed/kubeserial/v1alpha1" ) diff --git a/pkg/monitor/monitor_test.go b/pkg/monitor/monitor_test.go index 194be3bb..5ba0f3eb 100644 --- a/pkg/monitor/monitor_test.go +++ b/pkg/monitor/monitor_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned/fake" "github.com/spf13/afero" "github.com/stretchr/testify/assert" diff --git a/pkg/webhooks/inject_device.go b/pkg/webhooks/inject_device.go index 7a9189a5..64ea1ece 100644 --- a/pkg/webhooks/inject_device.go +++ b/pkg/webhooks/inject_device.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/janekbaraniewski/kubeserial/pkg/apis/kubeserial/v1alpha1" + "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" "github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned" "github.com/janekbaraniewski/kubeserial/pkg/images" corev1 "k8s.io/api/core/v1"