Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename Repository to Kubernetes #82

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Rename Repository to Kubernetes #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions charts/kubernetes/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
0 ...org_clustermanagerapplicationbundles.yaml → ...org_clustermanagerapplicationbundles.yaml
View file
Open in desktop
File renamed without changes.
0 ...ds/unikorn-cloud.org_clustermanagers.yaml → ...ds/unikorn-cloud.org_clustermanagers.yaml
View file
Open in desktop
File renamed without changes.
0 ..._kubernetesclusterapplicationbundles.yaml → ..._kubernetesclusterapplicationbundles.yaml
View file
Open in desktop
File renamed without changes.
0 ...unikorn-cloud.org_kubernetesclusters.yaml → ...unikorn-cloud.org_kubernetesclusters.yaml
View file
Open in desktop
File renamed without changes.
0 ...ikorn/crds/unikorn-cloud.org_regions.yaml → ...netes/crds/unikorn-cloud.org_regions.yaml
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/templates/_helpers.tpl → charts/kubernetes/templates/_helpers.tpl
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/templates/applications.yaml → ...ts/kubernetes/templates/applications.yaml
View file
Open in desktop
File renamed without changes.
0 ...lates/cluster-controller/clusterrole.yaml → ...lates/cluster-controller/clusterrole.yaml
View file
Open in desktop
File renamed without changes.
0 ...luster-controller/clusterrolebinding.yaml → ...luster-controller/clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...plates/cluster-controller/deployment.yaml → ...plates/cluster-controller/deployment.yaml
View file
Open in desktop
File renamed without changes.
0 ...rn/templates/cluster-controller/role.yaml → ...es/templates/cluster-controller/role.yaml
View file
Open in desktop
File renamed without changes.
0 ...lates/cluster-controller/rolebinding.yaml → ...lates/cluster-controller/rolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...templates/cluster-controller/service.yaml → ...templates/cluster-controller/service.yaml
View file
Open in desktop
File renamed without changes.
0 ...es/cluster-controller/serviceaccount.yaml → ...es/cluster-controller/serviceaccount.yaml
View file
Open in desktop
File renamed without changes.
0 ...uster-manager-controller/clusterrole.yaml → ...uster-manager-controller/clusterrole.yaml
View file
Open in desktop
File renamed without changes.
0 ...anager-controller/clusterrolebinding.yaml → ...anager-controller/clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...luster-manager-controller/deployment.yaml → ...luster-manager-controller/deployment.yaml
View file
Open in desktop
File renamed without changes.
0 ...ates/cluster-manager-controller/role.yaml → ...ates/cluster-manager-controller/role.yaml
View file
Open in desktop
File renamed without changes.
0 ...uster-manager-controller/rolebinding.yaml → ...uster-manager-controller/rolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...s/cluster-manager-controller/service.yaml → ...s/cluster-manager-controller/service.yaml
View file
Open in desktop
File renamed without changes.
0 ...er-manager-controller/serviceaccount.yaml → ...er-manager-controller/serviceaccount.yaml
View file
Open in desktop
File renamed without changes.
0 ...tes/clustermanagerapplicationbundles.yaml → ...tes/clustermanagerapplicationbundles.yaml
View file
Open in desktop
File renamed without changes.
0 .../unikorn/templates/image-pull-secret.yaml → ...bernetes/templates/image-pull-secret.yaml
View file
Open in desktop
File renamed without changes.
0 .../kubernetesclusterapplicationbundles.yaml → .../kubernetesclusterapplicationbundles.yaml
View file
Open in desktop
File renamed without changes.
0 ...nikorn/templates/monitor/clusterrole.yaml → ...rnetes/templates/monitor/clusterrole.yaml
View file
Open in desktop
File renamed without changes.
0 ...templates/monitor/clusterrolebinding.yaml → ...templates/monitor/clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...unikorn/templates/monitor/deployment.yaml → ...ernetes/templates/monitor/deployment.yaml
View file
Open in desktop
File renamed without changes.
0 ...orn/templates/monitor/serviceaccount.yaml → ...tes/templates/monitor/serviceaccount.yaml
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/templates/prometheus.yaml → charts/kubernetes/templates/prometheus.yaml
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/templates/region.yaml → charts/kubernetes/templates/region.yaml
View file
Open in desktop
File renamed without changes.
0 ...unikorn/templates/server/clusterrole.yaml → ...ernetes/templates/server/clusterrole.yaml
View file
Open in desktop
File renamed without changes.
0 .../templates/server/clusterrolebinding.yaml → .../templates/server/clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 .../unikorn/templates/server/deployment.yaml → ...bernetes/templates/server/deployment.yaml
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/templates/server/ingress.yaml → .../kubernetes/templates/server/ingress.yaml
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/templates/server/issuer.yaml → ...s/kubernetes/templates/server/issuer.yaml
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/templates/server/service.yaml → .../kubernetes/templates/server/service.yaml
View file
Open in desktop
File renamed without changes.
0 ...korn/templates/server/serviceaccount.yaml → ...etes/templates/server/serviceaccount.yaml
View file
Open in desktop
File renamed without changes.
0 charts/unikorn/values.yaml → charts/kubernetes/values.yaml
View file
Open in desktop
File renamed without changes.
10 changes: 0 additions & 10 deletions charts/unikorn/Chart.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/unikorn-cluster-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/unikorn-cluster-manager-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/unikorn-monitor/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/unikorn-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/unikorn-cloud/unikorn
module github.com/unikorn-cloud/kubernetes

go 1.22.1

Expand Down
2 changes: 1 addition & 1 deletion hack/sbom/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion hack/validate_openapi/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/http"
"os"

"github.com/unikorn-cloud/unikorn/pkg/openapi"
"github.com/unikorn-cloud/kubernetes/pkg/openapi"
)

//nolint:gochecknoglobals
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/unikorn/v1alpha1/types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions pkg/managers/cluster/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkg/managers/clustermanager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/monitor/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkg/monitor/upgrade/cluster/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkg/monitor/upgrade/clustermanager/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/monitor/upgrade/util/timewindow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/monitor/upgrade/util/timewindow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/provisioners/helmapplications/cilium/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/provisioners/helmapplications/clusterautoscaler/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/provisioners/helmapplications/clusteropenstack/hack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion pkg/provisioners/helmapplications/clusteropenstack/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/provisioners/helmapplications/clusteropenstack/remotecluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/provisioners/helmapplications/openstackcloudprovider/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/provisioners/helmapplications/openstackplugincindercsi/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 10 additions & 10 deletions pkg/provisioners/managers/cluster/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions pkg/provisioners/managers/clustermanager/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/application/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/applicationbundle/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
16 changes: 8 additions & 8 deletions pkg/server/handler/cluster/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkg/server/handler/cluster/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions pkg/server/handler/clustermanager/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading