From 80de664286ad93675e06a9948eecc2616920b51b Mon Sep 17 00:00:00 2001 From: Simon Murray Date: Wed, 12 Jun 2024 11:10:00 +0100 Subject: [PATCH] Rename Repository to Kubernetes "unikorn" has outlived its welcome now identity and regions have been separated, it's a bigger thing! This renames the repo to "kubernetes" in the hope it hints to users this is for Kubernetes only, and not somewhere to lump other things. Fixes #68 --- .github/workflows/pull-request.yaml | 2 +- Makefile | 6 +++--- charts/kubernetes/Chart.yaml | 10 ++++++++++ ....org_clustermanagerapplicationbundles.yaml | 0 .../unikorn-cloud.org_clustermanagers.yaml | 0 ...g_kubernetesclusterapplicationbundles.yaml | 0 .../unikorn-cloud.org_kubernetesclusters.yaml | 0 .../crds/unikorn-cloud.org_regions.yaml | 0 .../templates/_helpers.tpl | 0 .../templates/applications.yaml | 0 .../cluster-controller/clusterrole.yaml | 0 .../clusterrolebinding.yaml | 0 .../cluster-controller/deployment.yaml | 0 .../templates/cluster-controller/role.yaml | 0 .../cluster-controller/rolebinding.yaml | 0 .../templates/cluster-controller/service.yaml | 0 .../cluster-controller/serviceaccount.yaml | 0 .../clusterrole.yaml | 0 .../clusterrolebinding.yaml | 0 .../deployment.yaml | 0 .../cluster-manager-controller/role.yaml | 0 .../rolebinding.yaml | 0 .../cluster-manager-controller/service.yaml | 0 .../serviceaccount.yaml | 0 .../clustermanagerapplicationbundles.yaml | 0 .../templates/image-pull-secret.yaml | 0 .../kubernetesclusterapplicationbundles.yaml | 0 .../templates/monitor/clusterrole.yaml | 0 .../templates/monitor/clusterrolebinding.yaml | 0 .../templates/monitor/deployment.yaml | 0 .../templates/monitor/serviceaccount.yaml | 0 .../templates/prometheus.yaml | 0 .../templates/region.yaml | 0 .../templates/server/clusterrole.yaml | 0 .../templates/server/clusterrolebinding.yaml | 0 .../templates/server/deployment.yaml | 0 .../templates/server/ingress.yaml | 0 .../templates/server/issuer.yaml | 0 .../templates/server/service.yaml | 0 .../templates/server/serviceaccount.yaml | 0 charts/{unikorn => kubernetes}/values.yaml | 0 charts/unikorn/Chart.yaml | 10 ---------- cmd/unikorn-cluster-controller/main.go | 2 +- .../main.go | 2 +- cmd/unikorn-monitor/main.go | 6 +++--- cmd/unikorn-server/main.go | 6 +++--- go.mod | 2 +- hack/sbom/main.go | 2 +- hack/validate_openapi/main.go | 2 +- pkg/apis/unikorn/v1alpha1/types_test.go | 2 +- pkg/managers/cluster/manager.go | 6 +++--- pkg/managers/clustermanager/manager.go | 6 +++--- pkg/monitor/monitor.go | 4 ++-- pkg/monitor/upgrade/cluster/check.go | 6 +++--- pkg/monitor/upgrade/clustermanager/check.go | 6 +++--- pkg/monitor/upgrade/util/timewindow.go | 2 +- pkg/monitor/upgrade/util/timewindow_test.go | 4 ++-- .../helmapplications/cilium/provisioner.go | 2 +- .../clusterautoscaler/provisioner.go | 4 ++-- .../helmapplications/clusteropenstack/hack.go | 2 +- .../clusteropenstack/provisioner.go | 2 +- .../clusteropenstack/remotecluster.go | 2 +- .../openstackcloudprovider/provisioner.go | 2 +- .../openstackplugincindercsi/provisioner.go | 4 ++-- .../managers/cluster/provisioner.go | 20 +++++++++---------- .../managers/clustermanager/provisioner.go | 8 ++++---- pkg/server/handler/application/client.go | 2 +- .../handler/applicationbundle/client.go | 2 +- pkg/server/handler/cluster/client.go | 16 +++++++-------- pkg/server/handler/cluster/conversion.go | 6 +++--- pkg/server/handler/clustermanager/client.go | 10 +++++----- pkg/server/handler/handler.go | 12 +++++------ pkg/server/handler/options.go | 2 +- pkg/server/server.go | 8 ++++---- 74 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 charts/kubernetes/Chart.yaml rename charts/{unikorn => kubernetes}/crds/unikorn-cloud.org_clustermanagerapplicationbundles.yaml (100%) rename charts/{unikorn => kubernetes}/crds/unikorn-cloud.org_clustermanagers.yaml (100%) rename charts/{unikorn => kubernetes}/crds/unikorn-cloud.org_kubernetesclusterapplicationbundles.yaml (100%) rename charts/{unikorn => kubernetes}/crds/unikorn-cloud.org_kubernetesclusters.yaml (100%) rename charts/{unikorn => kubernetes}/crds/unikorn-cloud.org_regions.yaml (100%) rename charts/{unikorn => kubernetes}/templates/_helpers.tpl (100%) rename charts/{unikorn => kubernetes}/templates/applications.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-controller/clusterrole.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-controller/clusterrolebinding.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-controller/deployment.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-controller/role.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-controller/rolebinding.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-controller/service.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-controller/serviceaccount.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-manager-controller/clusterrole.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-manager-controller/clusterrolebinding.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-manager-controller/deployment.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-manager-controller/role.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-manager-controller/rolebinding.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-manager-controller/service.yaml (100%) rename charts/{unikorn => kubernetes}/templates/cluster-manager-controller/serviceaccount.yaml (100%) rename charts/{unikorn => kubernetes}/templates/clustermanagerapplicationbundles.yaml (100%) rename charts/{unikorn => kubernetes}/templates/image-pull-secret.yaml (100%) rename charts/{unikorn => kubernetes}/templates/kubernetesclusterapplicationbundles.yaml (100%) rename charts/{unikorn => kubernetes}/templates/monitor/clusterrole.yaml (100%) rename charts/{unikorn => kubernetes}/templates/monitor/clusterrolebinding.yaml (100%) rename charts/{unikorn => kubernetes}/templates/monitor/deployment.yaml (100%) rename charts/{unikorn => kubernetes}/templates/monitor/serviceaccount.yaml (100%) rename charts/{unikorn => kubernetes}/templates/prometheus.yaml (100%) rename charts/{unikorn => kubernetes}/templates/region.yaml (100%) rename charts/{unikorn => kubernetes}/templates/server/clusterrole.yaml (100%) rename charts/{unikorn => kubernetes}/templates/server/clusterrolebinding.yaml (100%) rename charts/{unikorn => kubernetes}/templates/server/deployment.yaml (100%) rename charts/{unikorn => kubernetes}/templates/server/ingress.yaml (100%) rename charts/{unikorn => kubernetes}/templates/server/issuer.yaml (100%) rename charts/{unikorn => kubernetes}/templates/server/service.yaml (100%) rename charts/{unikorn => kubernetes}/templates/server/serviceaccount.yaml (100%) rename charts/{unikorn => kubernetes}/values.yaml (100%) delete mode 100644 charts/unikorn/Chart.yaml diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 92883479..79f18fc6 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -46,7 +46,7 @@ jobs: - name: Golang CI/Helm Lint run: make lint - name: Build Images - run: make charts/unikorn/crds images + run: make charts/kubernetes/crds images - name: Build Generated Code run: make generate - name: Generated Code Checked In diff --git a/Makefile b/Makefile index 3c7827c5..d4326906 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ BINDIR = bin CMDDIR = cmd SRCDIR = src GENDIR = generated -CRDDIR = charts/unikorn/crds +CRDDIR = charts/kubernetes/crds # Where to install things. PREFIX = $(HOME)/bin @@ -84,7 +84,7 @@ MOCKGEN_VERSION=v0.3.0 # This is the base directory to generate kubernetes API primitives from e.g. # clients and CRDs. -GENAPIBASE = github.com/unikorn-cloud/unikorn/pkg/apis +GENAPIBASE = github.com/unikorn-cloud/kubernetes/pkg/apis # This is the list of APIs to generate clients for. GENAPIS = $(GENAPIBASE)/unikorn/v1alpha1 @@ -189,7 +189,7 @@ touch: lint: $(GENDIR) @go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(LINT_VERSION) $(GOBIN)/golangci-lint run ./... - helm lint --strict charts/unikorn + helm lint --strict charts/kubernetes # Validate the server OpenAPI schema is legit. .PHONY: validate diff --git a/charts/kubernetes/Chart.yaml b/charts/kubernetes/Chart.yaml new file mode 100644 index 00000000..54e6e98c --- /dev/null +++ b/charts/kubernetes/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +name: unikorn-kubernetes +description: A Helm chart for deploying Unikorn Kubernetes Service + +type: application + +version: v0.2.11 +appVersion: v0.2.11 + +icon: https://raw.githubusercontent.com/unikorn-cloud/kubernetes/main/icons/default.png diff --git a/charts/unikorn/crds/unikorn-cloud.org_clustermanagerapplicationbundles.yaml b/charts/kubernetes/crds/unikorn-cloud.org_clustermanagerapplicationbundles.yaml similarity index 100% rename from charts/unikorn/crds/unikorn-cloud.org_clustermanagerapplicationbundles.yaml rename to charts/kubernetes/crds/unikorn-cloud.org_clustermanagerapplicationbundles.yaml diff --git a/charts/unikorn/crds/unikorn-cloud.org_clustermanagers.yaml b/charts/kubernetes/crds/unikorn-cloud.org_clustermanagers.yaml similarity index 100% rename from charts/unikorn/crds/unikorn-cloud.org_clustermanagers.yaml rename to charts/kubernetes/crds/unikorn-cloud.org_clustermanagers.yaml diff --git a/charts/unikorn/crds/unikorn-cloud.org_kubernetesclusterapplicationbundles.yaml b/charts/kubernetes/crds/unikorn-cloud.org_kubernetesclusterapplicationbundles.yaml similarity index 100% rename from charts/unikorn/crds/unikorn-cloud.org_kubernetesclusterapplicationbundles.yaml rename to charts/kubernetes/crds/unikorn-cloud.org_kubernetesclusterapplicationbundles.yaml diff --git a/charts/unikorn/crds/unikorn-cloud.org_kubernetesclusters.yaml b/charts/kubernetes/crds/unikorn-cloud.org_kubernetesclusters.yaml similarity index 100% rename from charts/unikorn/crds/unikorn-cloud.org_kubernetesclusters.yaml rename to charts/kubernetes/crds/unikorn-cloud.org_kubernetesclusters.yaml diff --git a/charts/unikorn/crds/unikorn-cloud.org_regions.yaml b/charts/kubernetes/crds/unikorn-cloud.org_regions.yaml similarity index 100% rename from charts/unikorn/crds/unikorn-cloud.org_regions.yaml rename to charts/kubernetes/crds/unikorn-cloud.org_regions.yaml diff --git a/charts/unikorn/templates/_helpers.tpl b/charts/kubernetes/templates/_helpers.tpl similarity index 100% rename from charts/unikorn/templates/_helpers.tpl rename to charts/kubernetes/templates/_helpers.tpl diff --git a/charts/unikorn/templates/applications.yaml b/charts/kubernetes/templates/applications.yaml similarity index 100% rename from charts/unikorn/templates/applications.yaml rename to charts/kubernetes/templates/applications.yaml diff --git a/charts/unikorn/templates/cluster-controller/clusterrole.yaml b/charts/kubernetes/templates/cluster-controller/clusterrole.yaml similarity index 100% rename from charts/unikorn/templates/cluster-controller/clusterrole.yaml rename to charts/kubernetes/templates/cluster-controller/clusterrole.yaml diff --git a/charts/unikorn/templates/cluster-controller/clusterrolebinding.yaml b/charts/kubernetes/templates/cluster-controller/clusterrolebinding.yaml similarity index 100% rename from charts/unikorn/templates/cluster-controller/clusterrolebinding.yaml rename to charts/kubernetes/templates/cluster-controller/clusterrolebinding.yaml diff --git a/charts/unikorn/templates/cluster-controller/deployment.yaml b/charts/kubernetes/templates/cluster-controller/deployment.yaml similarity index 100% rename from charts/unikorn/templates/cluster-controller/deployment.yaml rename to charts/kubernetes/templates/cluster-controller/deployment.yaml diff --git a/charts/unikorn/templates/cluster-controller/role.yaml b/charts/kubernetes/templates/cluster-controller/role.yaml similarity index 100% rename from charts/unikorn/templates/cluster-controller/role.yaml rename to charts/kubernetes/templates/cluster-controller/role.yaml diff --git a/charts/unikorn/templates/cluster-controller/rolebinding.yaml b/charts/kubernetes/templates/cluster-controller/rolebinding.yaml similarity index 100% rename from charts/unikorn/templates/cluster-controller/rolebinding.yaml rename to charts/kubernetes/templates/cluster-controller/rolebinding.yaml diff --git a/charts/unikorn/templates/cluster-controller/service.yaml b/charts/kubernetes/templates/cluster-controller/service.yaml similarity index 100% rename from charts/unikorn/templates/cluster-controller/service.yaml rename to charts/kubernetes/templates/cluster-controller/service.yaml diff --git a/charts/unikorn/templates/cluster-controller/serviceaccount.yaml b/charts/kubernetes/templates/cluster-controller/serviceaccount.yaml similarity index 100% rename from charts/unikorn/templates/cluster-controller/serviceaccount.yaml rename to charts/kubernetes/templates/cluster-controller/serviceaccount.yaml diff --git a/charts/unikorn/templates/cluster-manager-controller/clusterrole.yaml b/charts/kubernetes/templates/cluster-manager-controller/clusterrole.yaml similarity index 100% rename from charts/unikorn/templates/cluster-manager-controller/clusterrole.yaml rename to charts/kubernetes/templates/cluster-manager-controller/clusterrole.yaml diff --git a/charts/unikorn/templates/cluster-manager-controller/clusterrolebinding.yaml b/charts/kubernetes/templates/cluster-manager-controller/clusterrolebinding.yaml similarity index 100% rename from charts/unikorn/templates/cluster-manager-controller/clusterrolebinding.yaml rename to charts/kubernetes/templates/cluster-manager-controller/clusterrolebinding.yaml diff --git a/charts/unikorn/templates/cluster-manager-controller/deployment.yaml b/charts/kubernetes/templates/cluster-manager-controller/deployment.yaml similarity index 100% rename from charts/unikorn/templates/cluster-manager-controller/deployment.yaml rename to charts/kubernetes/templates/cluster-manager-controller/deployment.yaml diff --git a/charts/unikorn/templates/cluster-manager-controller/role.yaml b/charts/kubernetes/templates/cluster-manager-controller/role.yaml similarity index 100% rename from charts/unikorn/templates/cluster-manager-controller/role.yaml rename to charts/kubernetes/templates/cluster-manager-controller/role.yaml diff --git a/charts/unikorn/templates/cluster-manager-controller/rolebinding.yaml b/charts/kubernetes/templates/cluster-manager-controller/rolebinding.yaml similarity index 100% rename from charts/unikorn/templates/cluster-manager-controller/rolebinding.yaml rename to charts/kubernetes/templates/cluster-manager-controller/rolebinding.yaml diff --git a/charts/unikorn/templates/cluster-manager-controller/service.yaml b/charts/kubernetes/templates/cluster-manager-controller/service.yaml similarity index 100% rename from charts/unikorn/templates/cluster-manager-controller/service.yaml rename to charts/kubernetes/templates/cluster-manager-controller/service.yaml diff --git a/charts/unikorn/templates/cluster-manager-controller/serviceaccount.yaml b/charts/kubernetes/templates/cluster-manager-controller/serviceaccount.yaml similarity index 100% rename from charts/unikorn/templates/cluster-manager-controller/serviceaccount.yaml rename to charts/kubernetes/templates/cluster-manager-controller/serviceaccount.yaml diff --git a/charts/unikorn/templates/clustermanagerapplicationbundles.yaml b/charts/kubernetes/templates/clustermanagerapplicationbundles.yaml similarity index 100% rename from charts/unikorn/templates/clustermanagerapplicationbundles.yaml rename to charts/kubernetes/templates/clustermanagerapplicationbundles.yaml diff --git a/charts/unikorn/templates/image-pull-secret.yaml b/charts/kubernetes/templates/image-pull-secret.yaml similarity index 100% rename from charts/unikorn/templates/image-pull-secret.yaml rename to charts/kubernetes/templates/image-pull-secret.yaml diff --git a/charts/unikorn/templates/kubernetesclusterapplicationbundles.yaml b/charts/kubernetes/templates/kubernetesclusterapplicationbundles.yaml similarity index 100% rename from charts/unikorn/templates/kubernetesclusterapplicationbundles.yaml rename to charts/kubernetes/templates/kubernetesclusterapplicationbundles.yaml diff --git a/charts/unikorn/templates/monitor/clusterrole.yaml b/charts/kubernetes/templates/monitor/clusterrole.yaml similarity index 100% rename from charts/unikorn/templates/monitor/clusterrole.yaml rename to charts/kubernetes/templates/monitor/clusterrole.yaml diff --git a/charts/unikorn/templates/monitor/clusterrolebinding.yaml b/charts/kubernetes/templates/monitor/clusterrolebinding.yaml similarity index 100% rename from charts/unikorn/templates/monitor/clusterrolebinding.yaml rename to charts/kubernetes/templates/monitor/clusterrolebinding.yaml diff --git a/charts/unikorn/templates/monitor/deployment.yaml b/charts/kubernetes/templates/monitor/deployment.yaml similarity index 100% rename from charts/unikorn/templates/monitor/deployment.yaml rename to charts/kubernetes/templates/monitor/deployment.yaml diff --git a/charts/unikorn/templates/monitor/serviceaccount.yaml b/charts/kubernetes/templates/monitor/serviceaccount.yaml similarity index 100% rename from charts/unikorn/templates/monitor/serviceaccount.yaml rename to charts/kubernetes/templates/monitor/serviceaccount.yaml diff --git a/charts/unikorn/templates/prometheus.yaml b/charts/kubernetes/templates/prometheus.yaml similarity index 100% rename from charts/unikorn/templates/prometheus.yaml rename to charts/kubernetes/templates/prometheus.yaml diff --git a/charts/unikorn/templates/region.yaml b/charts/kubernetes/templates/region.yaml similarity index 100% rename from charts/unikorn/templates/region.yaml rename to charts/kubernetes/templates/region.yaml diff --git a/charts/unikorn/templates/server/clusterrole.yaml b/charts/kubernetes/templates/server/clusterrole.yaml similarity index 100% rename from charts/unikorn/templates/server/clusterrole.yaml rename to charts/kubernetes/templates/server/clusterrole.yaml diff --git a/charts/unikorn/templates/server/clusterrolebinding.yaml b/charts/kubernetes/templates/server/clusterrolebinding.yaml similarity index 100% rename from charts/unikorn/templates/server/clusterrolebinding.yaml rename to charts/kubernetes/templates/server/clusterrolebinding.yaml diff --git a/charts/unikorn/templates/server/deployment.yaml b/charts/kubernetes/templates/server/deployment.yaml similarity index 100% rename from charts/unikorn/templates/server/deployment.yaml rename to charts/kubernetes/templates/server/deployment.yaml diff --git a/charts/unikorn/templates/server/ingress.yaml b/charts/kubernetes/templates/server/ingress.yaml similarity index 100% rename from charts/unikorn/templates/server/ingress.yaml rename to charts/kubernetes/templates/server/ingress.yaml diff --git a/charts/unikorn/templates/server/issuer.yaml b/charts/kubernetes/templates/server/issuer.yaml similarity index 100% rename from charts/unikorn/templates/server/issuer.yaml rename to charts/kubernetes/templates/server/issuer.yaml diff --git a/charts/unikorn/templates/server/service.yaml b/charts/kubernetes/templates/server/service.yaml similarity index 100% rename from charts/unikorn/templates/server/service.yaml rename to charts/kubernetes/templates/server/service.yaml diff --git a/charts/unikorn/templates/server/serviceaccount.yaml b/charts/kubernetes/templates/server/serviceaccount.yaml similarity index 100% rename from charts/unikorn/templates/server/serviceaccount.yaml rename to charts/kubernetes/templates/server/serviceaccount.yaml diff --git a/charts/unikorn/values.yaml b/charts/kubernetes/values.yaml similarity index 100% rename from charts/unikorn/values.yaml rename to charts/kubernetes/values.yaml diff --git a/charts/unikorn/Chart.yaml b/charts/unikorn/Chart.yaml deleted file mode 100644 index c19ec4bb..00000000 --- a/charts/unikorn/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: unikorn -description: A Helm chart for deploying Unikorn - -type: application - -version: v0.2.10 -appVersion: v0.2.10 - -icon: https://raw.githubusercontent.com/unikorn-cloud/unikorn/main/icons/default.png diff --git a/cmd/unikorn-cluster-controller/main.go b/cmd/unikorn-cluster-controller/main.go index 0cd9562c..02777f0c 100644 --- a/cmd/unikorn-cluster-controller/main.go +++ b/cmd/unikorn-cluster-controller/main.go @@ -19,7 +19,7 @@ package main import ( "github.com/unikorn-cloud/core/pkg/manager" - "github.com/unikorn-cloud/unikorn/pkg/managers/cluster" + "github.com/unikorn-cloud/kubernetes/pkg/managers/cluster" ) func main() { diff --git a/cmd/unikorn-cluster-manager-controller/main.go b/cmd/unikorn-cluster-manager-controller/main.go index 1d5b1d32..a797a5e2 100644 --- a/cmd/unikorn-cluster-manager-controller/main.go +++ b/cmd/unikorn-cluster-manager-controller/main.go @@ -19,7 +19,7 @@ package main import ( "github.com/unikorn-cloud/core/pkg/manager" - "github.com/unikorn-cloud/unikorn/pkg/managers/clustermanager" + "github.com/unikorn-cloud/kubernetes/pkg/managers/clustermanager" ) func main() { diff --git a/cmd/unikorn-monitor/main.go b/cmd/unikorn-monitor/main.go index 550c9a93..ff6ea3a0 100644 --- a/cmd/unikorn-monitor/main.go +++ b/cmd/unikorn-monitor/main.go @@ -27,9 +27,9 @@ import ( "github.com/spf13/pflag" coreclient "github.com/unikorn-cloud/core/pkg/client" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/constants" - "github.com/unikorn-cloud/unikorn/pkg/monitor" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/constants" + "github.com/unikorn-cloud/kubernetes/pkg/monitor" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/cmd/unikorn-server/main.go b/cmd/unikorn-server/main.go index f765a666..cbf4201c 100644 --- a/cmd/unikorn-server/main.go +++ b/cmd/unikorn-server/main.go @@ -30,9 +30,9 @@ import ( "github.com/spf13/pflag" "github.com/unikorn-cloud/core/pkg/client" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/constants" - "github.com/unikorn-cloud/unikorn/pkg/server" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/constants" + "github.com/unikorn-cloud/kubernetes/pkg/server" "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/go.mod b/go.mod index fb19fd7e..e2de7484 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/unikorn-cloud/unikorn +module github.com/unikorn-cloud/kubernetes go 1.22.1 diff --git a/hack/sbom/main.go b/hack/sbom/main.go index 1c67d588..aa9379a0 100644 --- a/hack/sbom/main.go +++ b/hack/sbom/main.go @@ -32,7 +32,7 @@ import ( spdx "github.com/spdx/tools-golang/spdx/v2/v2_3" unikornv1core "github.com/unikorn-cloud/core/pkg/apis/unikorn/v1alpha1" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" "sigs.k8s.io/yaml" ) diff --git a/hack/validate_openapi/main.go b/hack/validate_openapi/main.go index d0bc445d..2befeed7 100644 --- a/hack/validate_openapi/main.go +++ b/hack/validate_openapi/main.go @@ -23,7 +23,7 @@ import ( "net/http" "os" - "github.com/unikorn-cloud/unikorn/pkg/openapi" + "github.com/unikorn-cloud/kubernetes/pkg/openapi" ) //nolint:gochecknoglobals diff --git a/pkg/apis/unikorn/v1alpha1/types_test.go b/pkg/apis/unikorn/v1alpha1/types_test.go index 3a0cda61..2cbee31c 100644 --- a/pkg/apis/unikorn/v1alpha1/types_test.go +++ b/pkg/apis/unikorn/v1alpha1/types_test.go @@ -21,7 +21,7 @@ import ( "net" "testing" - "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" ) const ( diff --git a/pkg/managers/cluster/manager.go b/pkg/managers/cluster/manager.go index 6782e7bf..86a8ef29 100644 --- a/pkg/managers/cluster/manager.go +++ b/pkg/managers/cluster/manager.go @@ -21,9 +21,9 @@ import ( coreclient "github.com/unikorn-cloud/core/pkg/client" coremanager "github.com/unikorn-cloud/core/pkg/manager" "github.com/unikorn-cloud/core/pkg/manager/options" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/constants" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/managers/cluster" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/constants" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/managers/cluster" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" diff --git a/pkg/managers/clustermanager/manager.go b/pkg/managers/clustermanager/manager.go index fc3e35ff..61efb5f5 100644 --- a/pkg/managers/clustermanager/manager.go +++ b/pkg/managers/clustermanager/manager.go @@ -21,9 +21,9 @@ import ( coreclient "github.com/unikorn-cloud/core/pkg/client" coremanager "github.com/unikorn-cloud/core/pkg/manager" "github.com/unikorn-cloud/core/pkg/manager/options" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/constants" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/managers/clustermanager" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/constants" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/managers/clustermanager" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" diff --git a/pkg/monitor/monitor.go b/pkg/monitor/monitor.go index 5266b259..af44c5c7 100644 --- a/pkg/monitor/monitor.go +++ b/pkg/monitor/monitor.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/pflag" - upgradecluster "github.com/unikorn-cloud/unikorn/pkg/monitor/upgrade/cluster" - upgradeclustermanager "github.com/unikorn-cloud/unikorn/pkg/monitor/upgrade/clustermanager" + upgradecluster "github.com/unikorn-cloud/kubernetes/pkg/monitor/upgrade/cluster" + upgradeclustermanager "github.com/unikorn-cloud/kubernetes/pkg/monitor/upgrade/clustermanager" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/pkg/monitor/upgrade/cluster/check.go b/pkg/monitor/upgrade/cluster/check.go index eeea1e33..2c256e97 100644 --- a/pkg/monitor/upgrade/cluster/check.go +++ b/pkg/monitor/upgrade/cluster/check.go @@ -24,9 +24,9 @@ import ( "time" "github.com/unikorn-cloud/core/pkg/constants" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/monitor/upgrade/errors" - "github.com/unikorn-cloud/unikorn/pkg/monitor/upgrade/util" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/monitor/upgrade/errors" + "github.com/unikorn-cloud/kubernetes/pkg/monitor/upgrade/util" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/pkg/monitor/upgrade/clustermanager/check.go b/pkg/monitor/upgrade/clustermanager/check.go index 3cef561d..1e8c0a8e 100644 --- a/pkg/monitor/upgrade/clustermanager/check.go +++ b/pkg/monitor/upgrade/clustermanager/check.go @@ -24,9 +24,9 @@ import ( "time" "github.com/unikorn-cloud/core/pkg/constants" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/monitor/upgrade/errors" - "github.com/unikorn-cloud/unikorn/pkg/monitor/upgrade/util" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/monitor/upgrade/errors" + "github.com/unikorn-cloud/kubernetes/pkg/monitor/upgrade/util" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/pkg/monitor/upgrade/util/timewindow.go b/pkg/monitor/upgrade/util/timewindow.go index 50667e40..9dcac045 100644 --- a/pkg/monitor/upgrade/util/timewindow.go +++ b/pkg/monitor/upgrade/util/timewindow.go @@ -22,7 +22,7 @@ import ( "crypto/sha256" "time" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/monitor/upgrade/util/timewindow_test.go b/pkg/monitor/upgrade/util/timewindow_test.go index 1e157cd2..c740c9d5 100644 --- a/pkg/monitor/upgrade/util/timewindow_test.go +++ b/pkg/monitor/upgrade/util/timewindow_test.go @@ -27,8 +27,8 @@ import ( "github.com/go-logr/logr" "github.com/google/uuid" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/monitor/upgrade/util" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/monitor/upgrade/util" ) const ( diff --git a/pkg/provisioners/helmapplications/cilium/provisioner.go b/pkg/provisioners/helmapplications/cilium/provisioner.go index 1b402a01..c4a005b9 100644 --- a/pkg/provisioners/helmapplications/cilium/provisioner.go +++ b/pkg/provisioners/helmapplications/cilium/provisioner.go @@ -22,7 +22,7 @@ import ( "github.com/unikorn-cloud/core/pkg/provisioners/application" "github.com/unikorn-cloud/core/pkg/provisioners/util" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" ) // New returns a new initialized provisioner object. diff --git a/pkg/provisioners/helmapplications/clusterautoscaler/provisioner.go b/pkg/provisioners/helmapplications/clusterautoscaler/provisioner.go index 9ab7e345..e19123a2 100644 --- a/pkg/provisioners/helmapplications/clusterautoscaler/provisioner.go +++ b/pkg/provisioners/helmapplications/clusterautoscaler/provisioner.go @@ -21,8 +21,8 @@ import ( "context" "github.com/unikorn-cloud/core/pkg/provisioners/application" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/clusteropenstack" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/clusteropenstack" ) // Provisioner encapsulates provisioning. diff --git a/pkg/provisioners/helmapplications/clusteropenstack/hack.go b/pkg/provisioners/helmapplications/clusteropenstack/hack.go index fc37288f..24394da3 100644 --- a/pkg/provisioners/helmapplications/clusteropenstack/hack.go +++ b/pkg/provisioners/helmapplications/clusteropenstack/hack.go @@ -25,7 +25,7 @@ import ( "github.com/unikorn-cloud/core/pkg/cd" coreclient "github.com/unikorn-cloud/core/pkg/client" "github.com/unikorn-cloud/core/pkg/provisioners/application" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/provisioners/helmapplications/clusteropenstack/provisioner.go b/pkg/provisioners/helmapplications/clusteropenstack/provisioner.go index 8228a09f..045dfe5c 100644 --- a/pkg/provisioners/helmapplications/clusteropenstack/provisioner.go +++ b/pkg/provisioners/helmapplications/clusteropenstack/provisioner.go @@ -24,7 +24,7 @@ import ( "github.com/unikorn-cloud/core/pkg/constants" "github.com/unikorn-cloud/core/pkg/provisioners/application" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" ) // Provisioner encapsulates control plane provisioning. diff --git a/pkg/provisioners/helmapplications/clusteropenstack/remotecluster.go b/pkg/provisioners/helmapplications/clusteropenstack/remotecluster.go index a3df37f5..ec0a4fb6 100644 --- a/pkg/provisioners/helmapplications/clusteropenstack/remotecluster.go +++ b/pkg/provisioners/helmapplications/clusteropenstack/remotecluster.go @@ -26,7 +26,7 @@ import ( coreclient "github.com/unikorn-cloud/core/pkg/client" "github.com/unikorn-cloud/core/pkg/constants" "github.com/unikorn-cloud/core/pkg/provisioners" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/provisioners/helmapplications/openstackcloudprovider/provisioner.go b/pkg/provisioners/helmapplications/openstackcloudprovider/provisioner.go index a5ef3baf..a381ce18 100644 --- a/pkg/provisioners/helmapplications/openstackcloudprovider/provisioner.go +++ b/pkg/provisioners/helmapplications/openstackcloudprovider/provisioner.go @@ -29,7 +29,7 @@ import ( "github.com/unikorn-cloud/core/pkg/constants" "github.com/unikorn-cloud/core/pkg/provisioners/application" "github.com/unikorn-cloud/core/pkg/provisioners/util" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" "sigs.k8s.io/yaml" ) diff --git a/pkg/provisioners/helmapplications/openstackplugincindercsi/provisioner.go b/pkg/provisioners/helmapplications/openstackplugincindercsi/provisioner.go index 7699d77e..ceba6357 100644 --- a/pkg/provisioners/helmapplications/openstackplugincindercsi/provisioner.go +++ b/pkg/provisioners/helmapplications/openstackplugincindercsi/provisioner.go @@ -25,8 +25,8 @@ import ( "github.com/unikorn-cloud/core/pkg/constants" "github.com/unikorn-cloud/core/pkg/provisioners/application" "github.com/unikorn-cloud/core/pkg/provisioners/util" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/openstackcloudprovider" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/openstackcloudprovider" corev1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" diff --git a/pkg/provisioners/managers/cluster/provisioner.go b/pkg/provisioners/managers/cluster/provisioner.go index 9f0cd397..ba944ca3 100644 --- a/pkg/provisioners/managers/cluster/provisioner.go +++ b/pkg/provisioners/managers/cluster/provisioner.go @@ -33,16 +33,16 @@ import ( "github.com/unikorn-cloud/core/pkg/provisioners/serial" provisionersutil "github.com/unikorn-cloud/core/pkg/provisioners/util" "github.com/unikorn-cloud/core/pkg/util" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/cilium" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/clusterautoscaler" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/clusterautoscaleropenstack" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/clusteropenstack" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/metricsserver" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/nvidiagpuoperator" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/openstackcloudprovider" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/openstackplugincindercsi" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/vcluster" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/cilium" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/clusterautoscaler" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/clusterautoscaleropenstack" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/clusteropenstack" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/metricsserver" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/nvidiagpuoperator" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/openstackcloudprovider" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/openstackplugincindercsi" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/vcluster" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/provisioners/managers/clustermanager/provisioner.go b/pkg/provisioners/managers/clustermanager/provisioner.go index 121d5c77..27248682 100644 --- a/pkg/provisioners/managers/clustermanager/provisioner.go +++ b/pkg/provisioners/managers/clustermanager/provisioner.go @@ -29,10 +29,10 @@ import ( "github.com/unikorn-cloud/core/pkg/provisioners/concurrent" "github.com/unikorn-cloud/core/pkg/provisioners/remotecluster" "github.com/unikorn-cloud/core/pkg/provisioners/serial" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/certmanager" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/clusterapi" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/vcluster" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/certmanager" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/clusterapi" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/vcluster" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/pkg/server/handler/application/client.go b/pkg/server/handler/application/client.go index b3043b4b..66485aae 100644 --- a/pkg/server/handler/application/client.go +++ b/pkg/server/handler/application/client.go @@ -25,7 +25,7 @@ import ( coreopenapi "github.com/unikorn-cloud/core/pkg/openapi" "github.com/unikorn-cloud/core/pkg/server/conversion" "github.com/unikorn-cloud/core/pkg/server/errors" - "github.com/unikorn-cloud/unikorn/pkg/openapi" + "github.com/unikorn-cloud/kubernetes/pkg/openapi" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/server/handler/applicationbundle/client.go b/pkg/server/handler/applicationbundle/client.go index e545f965..0b53982f 100644 --- a/pkg/server/handler/applicationbundle/client.go +++ b/pkg/server/handler/applicationbundle/client.go @@ -22,7 +22,7 @@ import ( "slices" "github.com/unikorn-cloud/core/pkg/server/errors" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/server/handler/cluster/client.go b/pkg/server/handler/cluster/client.go index d55f9973..5ae0b069 100644 --- a/pkg/server/handler/cluster/client.go +++ b/pkg/server/handler/cluster/client.go @@ -31,15 +31,15 @@ import ( "github.com/unikorn-cloud/core/pkg/constants" "github.com/unikorn-cloud/core/pkg/server/errors" "github.com/unikorn-cloud/core/pkg/util" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/clients/region" + "github.com/unikorn-cloud/kubernetes/pkg/openapi" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/clusteropenstack" + "github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/vcluster" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/clustermanager" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/common" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/scoping" regionapi "github.com/unikorn-cloud/region/pkg/openapi" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/clients/region" - "github.com/unikorn-cloud/unikorn/pkg/openapi" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/clusteropenstack" - "github.com/unikorn-cloud/unikorn/pkg/provisioners/helmapplications/vcluster" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/clustermanager" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/common" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/scoping" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/server/handler/cluster/conversion.go b/pkg/server/handler/cluster/conversion.go index 7605553a..d3b26056 100644 --- a/pkg/server/handler/cluster/conversion.go +++ b/pkg/server/handler/cluster/conversion.go @@ -28,10 +28,10 @@ import ( "github.com/unikorn-cloud/core/pkg/server/conversion" "github.com/unikorn-cloud/core/pkg/server/errors" "github.com/unikorn-cloud/core/pkg/util" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/openapi" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/applicationbundle" regionapi "github.com/unikorn-cloud/region/pkg/openapi" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/openapi" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/applicationbundle" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/server/handler/clustermanager/client.go b/pkg/server/handler/clustermanager/client.go index 9a9c4d03..4c096c1f 100644 --- a/pkg/server/handler/clustermanager/client.go +++ b/pkg/server/handler/clustermanager/client.go @@ -28,11 +28,11 @@ import ( "github.com/unikorn-cloud/core/pkg/server/errors" "github.com/unikorn-cloud/core/pkg/util" "github.com/unikorn-cloud/core/pkg/util/retry" - unikornv1 "github.com/unikorn-cloud/unikorn/pkg/apis/unikorn/v1alpha1" - "github.com/unikorn-cloud/unikorn/pkg/openapi" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/applicationbundle" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/common" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/scoping" + unikornv1 "github.com/unikorn-cloud/kubernetes/pkg/apis/unikorn/v1alpha1" + "github.com/unikorn-cloud/kubernetes/pkg/openapi" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/applicationbundle" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/common" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/scoping" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/server/handler/handler.go b/pkg/server/handler/handler.go index 8ab48ce9..a9df05fc 100644 --- a/pkg/server/handler/handler.go +++ b/pkg/server/handler/handler.go @@ -27,12 +27,12 @@ import ( "github.com/unikorn-cloud/core/pkg/authorization/userinfo" "github.com/unikorn-cloud/core/pkg/server/errors" "github.com/unikorn-cloud/core/pkg/server/middleware/openapi/oidc" - "github.com/unikorn-cloud/unikorn/pkg/clients/region" - "github.com/unikorn-cloud/unikorn/pkg/openapi" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/application" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/cluster" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/clustermanager" - "github.com/unikorn-cloud/unikorn/pkg/server/util" + "github.com/unikorn-cloud/kubernetes/pkg/clients/region" + "github.com/unikorn-cloud/kubernetes/pkg/openapi" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/application" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/cluster" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/clustermanager" + "github.com/unikorn-cloud/kubernetes/pkg/server/util" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/server/handler/options.go b/pkg/server/handler/options.go index af550909..bdea3661 100644 --- a/pkg/server/handler/options.go +++ b/pkg/server/handler/options.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" - "github.com/unikorn-cloud/unikorn/pkg/server/handler/cluster" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler/cluster" ) // Options defines configurable handler options. diff --git a/pkg/server/server.go b/pkg/server/server.go index bb27672c..85c4c5d5 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -36,10 +36,10 @@ import ( "github.com/unikorn-cloud/core/pkg/server/middleware/openapi/oidc" "github.com/unikorn-cloud/core/pkg/server/middleware/opentelemetry" "github.com/unikorn-cloud/core/pkg/server/middleware/timeout" - "github.com/unikorn-cloud/unikorn/pkg/clients/region" - "github.com/unikorn-cloud/unikorn/pkg/constants" - "github.com/unikorn-cloud/unikorn/pkg/openapi" - "github.com/unikorn-cloud/unikorn/pkg/server/handler" + "github.com/unikorn-cloud/kubernetes/pkg/clients/region" + "github.com/unikorn-cloud/kubernetes/pkg/constants" + "github.com/unikorn-cloud/kubernetes/pkg/openapi" + "github.com/unikorn-cloud/kubernetes/pkg/server/handler" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log"