Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit

Permalink
Merge pull request #97 from FabianKramm/master
Browse files Browse the repository at this point in the history
chore: kiosk-sh/kiosk -> loft-sh/kiosk
  • Loading branch information
FabianKramm authored Jan 25, 2021
2 parents eba4527 + 7fef2c6 commit 3994bf1
Show file tree
Hide file tree
Showing 95 changed files with 2,299 additions and 1,689 deletions.
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
domain: kiosk.sh
repo: github.com/kiosk-sh/kiosk
repo: github.com/loft-sh/kiosk
resources:
- group: config
kind: Account
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Kubernetes is designed as a single-tenant platform, which makes it hard for clus

While there are hundreds of ways of setting up multi-tenant Kubernetes clusters and many Kubernetes distributions provide their own tenancy logic, there is no lightweight, pluggable and customizable solution that allows admins to easily add multi-tenancy capabilities to any standard Kubernetes cluster.

### The Missing Multi-Tenancy Extension for Kubernetes [![> Tweet <](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Fgithub.jparrowsec.cn%2Fkiosk-sh%2Fkiosk)](https://twitter.com/intent/tweet?text=The%20Missing%20Multi-Tenancy%20Extension%20for%20%23Kubernetes%3A%20%23kiosk%20-%20https%3A//github.com/kiosk-sh/kiosk%20%23cncf)
### The Missing Multi-Tenancy Extension for Kubernetes [![> Tweet <](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Fgithub.jparrowsec.cn%2Fkiosk-sh%2Fkiosk)](https://twitter.com/intent/tweet?text=The%20Missing%20Multi-Tenancy%20Extension%20for%20%23Kubernetes%3A%20%23kiosk%20-%20https%3A//github.com/loft-sh/kiosk%20%23cncf)
kiosk is designed to be:
- **100% Open-Source**: CNCF compatible Apache 2.0 license
- **Pluggable**: easy to install into any existing cluster and suitable for different use cases
Expand Down Expand Up @@ -946,7 +946,7 @@ spec:
```bash
helm upgrade kiosk --repo https://charts.devspace.sh/ kiosk -n kiosk --atomic --reuse-values
```
Check the [release notes](https://github.com/kiosk-sh/kiosk/releases) for details on how to upgrade to a specific release.
Check the [release notes](https://github.com/loft-sh/kiosk/releases) for details on how to upgrade to a specific release.
**Do not skip releases with release notes containing upgrade instructions!**

<br>
Expand Down
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v2
name: kiosk
description: Multi-Tenancy Extension For Kubernetes
home: https://github.com/kiosk-sh/kiosk
home: https://github.com/loft-sh/kiosk
icon: https://static.devspace.cloud/kiosk/logo-compact/kiosk-logo-compact.svg
sources:
- https://github.com/kiosk-sh/kiosk
- https://github.com/loft-sh/kiosk
keywords:
- multi-tenancy
- tenancy
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ To learn more about the release, try:
$ helm status {{ .Release.Name }} -n {{ .Release.Namespace }}
$ helm get all {{ .Release.Name }} -n {{ .Release.Namespace }}

Learn more about using kiosk here: https://github.com/kiosk-sh/kiosk#getting-started
Learn more about using kiosk here: https://github.com/loft-sh/kiosk#getting-started
32 changes: 16 additions & 16 deletions cmd/kiosk/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ package main

import (
"context"
"github.com/kiosk-sh/kiosk/pkg/apis"
"github.com/kiosk-sh/kiosk/pkg/apis/tenancy"
tenancyv1alpha1 "github.com/kiosk-sh/kiosk/pkg/apis/tenancy/v1alpha1"
"github.com/kiosk-sh/kiosk/pkg/apiserver"
_ "github.com/kiosk-sh/kiosk/pkg/apiserver/registry"
"github.com/kiosk-sh/kiosk/pkg/manager/blockingcacheclient"
"github.com/kiosk-sh/kiosk/pkg/openapi"
"github.com/kiosk-sh/kiosk/pkg/store/apiservice"
"github.com/kiosk-sh/kiosk/pkg/store/crd"
"github.com/kiosk-sh/kiosk/pkg/store/validatingwebhookconfiguration"
"github.com/kiosk-sh/kiosk/pkg/util/certhelper"
"github.com/kiosk-sh/kiosk/pkg/util/log"
"github.com/loft-sh/kiosk/pkg/apis"
"github.com/loft-sh/kiosk/pkg/apis/tenancy"
tenancyv1alpha1 "github.com/loft-sh/kiosk/pkg/apis/tenancy/v1alpha1"
"github.com/loft-sh/kiosk/pkg/apiserver"
_ "github.com/loft-sh/kiosk/pkg/apiserver/registry"
"github.com/loft-sh/kiosk/pkg/manager/blockingcacheclient"
"github.com/loft-sh/kiosk/pkg/openapi"
"github.com/loft-sh/kiosk/pkg/store/apiservice"
"github.com/loft-sh/kiosk/pkg/store/crd"
"github.com/loft-sh/kiosk/pkg/store/validatingwebhookconfiguration"
"github.com/loft-sh/kiosk/pkg/util/certhelper"
"github.com/loft-sh/kiosk/pkg/util/log"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/client-go/rest"
Expand All @@ -39,10 +39,10 @@ import (
client2 "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"

configv1alpha1 "github.com/kiosk-sh/kiosk/pkg/apis/config/v1alpha1"
"github.com/kiosk-sh/kiosk/pkg/manager/controllers"
"github.com/kiosk-sh/kiosk/pkg/manager/quota"
"github.com/kiosk-sh/kiosk/pkg/manager/webhooks"
configv1alpha1 "github.com/loft-sh/kiosk/pkg/apis/config/v1alpha1"
"github.com/loft-sh/kiosk/pkg/manager/controllers"
"github.com/loft-sh/kiosk/pkg/manager/quota"
"github.com/loft-sh/kiosk/pkg/manager/webhooks"
"k8s.io/apimachinery/pkg/runtime"
genericfeatures "k8s.io/apiserver/pkg/features"
featureutil "k8s.io/apiserver/pkg/util/feature"
Expand Down
3 changes: 1 addition & 2 deletions gen/cmd/apis/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ import (
"os"
"runtime"

"github.com/kiosk-sh/kiosk/gen/cmd/apis/template"
"github.com/loft-sh/kiosk/gen/cmd/apis/template"
"k8s.io/gengo/args"
"k8s.io/klog"
)

func main() {

if len(os.Getenv("GOMAXPROCS")) == 0 {
runtime.GOMAXPROCS(runtime.NumCPU())
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kiosk-sh/kiosk
module github.com/loft-sh/kiosk

require (
github.com/Azure/go-autorest v13.0.0+incompatible // indirect
Expand Down
14 changes: 7 additions & 7 deletions hack/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ set -e
echo "Generate apis..."

GO111MODULE=off
go run gen/cmd/apis/main.go --input-dirs github.com/kiosk-sh/kiosk/pkg/apis/... --go-header-file ./hack/boilerplate.go.txt
go run gen/cmd/apis/main.go --input-dirs github.com/loft-sh/kiosk/pkg/apis/... --go-header-file ./hack/boilerplate.go.txt

echo "Generate conversion, deepcopy, defaulter, openapi, client, lister & informers ..."

conversion-gen --input-dirs github.com/kiosk-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt -O zz_generated.conversion --extra-peer-dirs k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/conversion,k8s.io/apimachinery/pkg/runtime
deepcopy-gen --input-dirs github.com/kiosk-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt -O zz_generated.deepcopy
openapi-gen --input-dirs github.com/kiosk-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt -i k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/api/admission/v1,k8s.io/api/admission/v1beta1,k8s.io/api/admissionregistration/v1,k8s.io/api/admissionregistration/v1beta1,k8s.io/api/apps/v1,k8s.io/api/apps/v1beta1,k8s.io/api/apps/v1beta2,k8s.io/api/auditregistration/v1alpha1,k8s.io/api/authentication/v1,k8s.io/api/authentication/v1beta1,k8s.io/api/authorization/v1,k8s.io/api/authorization/v1beta1,k8s.io/api/autoscaling/v1,k8s.io/api/autoscaling/v2beta1,k8s.io/api/autoscaling/v2beta2,k8s.io/api/batch/v1,k8s.io/api/batch/v1beta1,k8s.io/api/batch/v2alpha1,k8s.io/api/certificates/v1beta1,k8s.io/api/coordination/v1,k8s.io/api/coordination/v1beta1,k8s.io/api/core/v1,k8s.io/api/discovery/v1alpha1,k8s.io/api/events/v1beta1,k8s.io/api/extensions/v1beta1,k8s.io/api/networking/v1,k8s.io/api/networking/v1beta1,k8s.io/api/node/v1alpha1,k8s.io/api/node/v1beta1,k8s.io/api/policy/v1beta1,k8s.io/api/rbac/v1,k8s.io/api/rbac/v1alpha1,k8s.io/api/rbac/v1beta1,k8s.io/api/scheduling/v1,k8s.io/api/scheduling/v1alpha1,k8s.io/api/scheduling/v1beta1,k8s.io/api/settings/v1alpha1,k8s.io/api/storage/v1,k8s.io/api/storage/v1alpha1,k8s.io/api/storage/v1beta1,k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1,k8s.io/client-go/pkg/apis/clientauthentication/v1beta1,k8s.io/api/core/v1 --report-filename violations.report --output-package github.com/kiosk-sh/kiosk/pkg/openapi
client-gen -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt --input-base github.com/kiosk-sh/kiosk/pkg/apis --input tenancy/v1alpha1 --input config/v1alpha1 --clientset-path github.com/kiosk-sh/kiosk/pkg/client/clientset_generated --clientset-name clientset
lister-gen --input-dirs github.com/kiosk-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt --output-package github.com/kiosk-sh/kiosk/pkg/client/listers_generated
informer-gen --input-dirs github.com/kiosk-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt --output-package github.com/kiosk-sh/kiosk/pkg/client/informers_generated --listers-package github.com/kiosk-sh/kiosk/pkg/client/listers_generated --versioned-clientset-package github.com/kiosk-sh/kiosk/pkg/client/clientset_generated/clientset
conversion-gen --input-dirs github.com/loft-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt -O zz_generated.conversion --extra-peer-dirs k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/conversion,k8s.io/apimachinery/pkg/runtime
deepcopy-gen --input-dirs github.com/loft-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt -O zz_generated.deepcopy
openapi-gen --input-dirs github.com/loft-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt -i k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/api/admission/v1,k8s.io/api/admission/v1beta1,k8s.io/api/admissionregistration/v1,k8s.io/api/admissionregistration/v1beta1,k8s.io/api/apps/v1,k8s.io/api/apps/v1beta1,k8s.io/api/apps/v1beta2,k8s.io/api/authentication/v1,k8s.io/api/authentication/v1beta1,k8s.io/api/authorization/v1,k8s.io/api/authorization/v1beta1,k8s.io/api/autoscaling/v1,k8s.io/api/autoscaling/v2beta1,k8s.io/api/autoscaling/v2beta2,k8s.io/api/batch/v1,k8s.io/api/batch/v1beta1,k8s.io/api/batch/v2alpha1,k8s.io/api/certificates/v1beta1,k8s.io/api/coordination/v1,k8s.io/api/coordination/v1beta1,k8s.io/api/core/v1,k8s.io/api/discovery/v1alpha1,k8s.io/api/events/v1beta1,k8s.io/api/extensions/v1beta1,k8s.io/api/networking/v1,k8s.io/api/networking/v1beta1,k8s.io/api/node/v1alpha1,k8s.io/api/node/v1beta1,k8s.io/api/policy/v1beta1,k8s.io/api/rbac/v1,k8s.io/api/rbac/v1alpha1,k8s.io/api/rbac/v1beta1,k8s.io/api/scheduling/v1,k8s.io/api/scheduling/v1alpha1,k8s.io/api/scheduling/v1beta1,k8s.io/api/settings/v1alpha1,k8s.io/api/storage/v1,k8s.io/api/storage/v1alpha1,k8s.io/api/storage/v1beta1,k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1,k8s.io/client-go/pkg/apis/clientauthentication/v1beta1,k8s.io/api/core/v1 --report-filename violations.report --output-package github.com/loft-sh/kiosk/pkg/openapi
client-gen -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt --input-base github.com/loft-sh/kiosk/pkg/apis --input tenancy/v1alpha1 --input config/v1alpha1 --clientset-path github.com/loft-sh/kiosk/pkg/client/clientset_generated --clientset-name clientset
lister-gen --input-dirs github.com/loft-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt --output-package github.com/loft-sh/kiosk/pkg/client/listers_generated
informer-gen --input-dirs github.com/loft-sh/kiosk/pkg/apis/... -o $GOPATH/src --go-header-file ./hack/boilerplate.go.txt --output-package github.com/loft-sh/kiosk/pkg/client/informers_generated --listers-package github.com/loft-sh/kiosk/pkg/client/listers_generated --versioned-clientset-package github.com/loft-sh/kiosk/pkg/client/clientset_generated/clientset
4 changes: 2 additions & 2 deletions kube/pkg/quota/v1/evaluator/core/persistent_volume_claims.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"fmt"
"strings"

quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
"github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/generic"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"github.com/loft-sh/kiosk/kube/pkg/quota/v1/generic"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
7 changes: 3 additions & 4 deletions kube/pkg/quota/v1/evaluator/core/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/selection"

quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
"github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/generic"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"github.com/loft-sh/kiosk/kube/pkg/quota/v1/generic"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation"
Expand Down Expand Up @@ -442,7 +442,6 @@ func GetPodQOS(pod *corev1.Pod) corev1.PodQOSClass {
return corev1.PodQOSBurstable
}


func isTerminating(pod *corev1.Pod) bool {
if pod.Spec.ActiveDeadlineSeconds != nil && *pod.Spec.ActiveDeadlineSeconds >= int64(0) {
return true
Expand Down Expand Up @@ -526,4 +525,4 @@ func QuotaV1Pod(pod *corev1.Pod, clock clock.Clock) bool {
}
}
return true
}
}
6 changes: 3 additions & 3 deletions kube/pkg/quota/v1/evaluator/core/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ limitations under the License.
package core

import (
quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
"github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/generic"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"github.com/loft-sh/kiosk/kube/pkg/quota/v1/generic"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/clock"
Expand Down Expand Up @@ -43,4 +43,4 @@ func NewEvaluators(f quota.ListerForResourceFunc) []quota.Evaluator {
generic.NewObjectCountEvaluator(gvr.GroupResource(), generic.ListResourceUsingListerFunc(f, gvr), alias))
}
return result
}
}
6 changes: 3 additions & 3 deletions kube/pkg/quota/v1/evaluator/core/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package core
import (
"fmt"

quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
"github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/generic"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"github.com/loft-sh/kiosk/kube/pkg/quota/v1/generic"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -143,4 +143,4 @@ func GetQuotaServiceType(service *corev1.Service) corev1.ServiceType {
return corev1.ServiceTypeLoadBalancer
}
return corev1.ServiceType("")
}
}
4 changes: 2 additions & 2 deletions kube/pkg/quota/v1/generic/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ limitations under the License.
package generic

import (
quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand All @@ -38,4 +38,4 @@ func (c *simpleConfiguration) IgnoredResources() map[schema.GroupResource]struct

func (c *simpleConfiguration) Evaluators() []quota.Evaluator {
return c.evaluators
}
}
4 changes: 2 additions & 2 deletions kube/pkg/quota/v1/generic/evaluator.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"fmt"
"sync/atomic"

quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/labels"
Expand Down Expand Up @@ -313,4 +313,4 @@ func NewObjectCountEvaluator(
listFuncByNamespace: listFuncByNamespace,
resourceNames: resourceNames,
}
}
}
4 changes: 2 additions & 2 deletions kube/pkg/quota/v1/generic/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package generic
import (
"sync"

quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -75,4 +75,4 @@ func evaluatorsList(input map[schema.GroupResource]quota.Evaluator) []quota.Eval
result = append(result, item)
}
return result
}
}
9 changes: 4 additions & 5 deletions kube/pkg/quota/v1/install/registry.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/*
Copyright 2016 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,9 +14,9 @@ limitations under the License.
package install

import (
quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
core "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/evaluator/core"
generic "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/generic"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
core "github.com/loft-sh/kiosk/kube/pkg/quota/v1/evaluator/core"
generic "github.com/loft-sh/kiosk/kube/pkg/quota/v1/generic"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -52,4 +51,4 @@ var ignoredResources = map[schema.GroupResource]struct{}{
// should ignore. This is exposed so downstream integrators can have access to them.
func DefaultIgnoredResources() map[schema.GroupResource]struct{} {
return ignoredResources
}
}
4 changes: 2 additions & 2 deletions kube/pkg/registry/rbac/validation/rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"k8s.io/klog"

rbacv1helpers "github.com/kiosk-sh/kiosk/kube/pkg/apis/rbac/v1"
rbacv1helpers "github.com/loft-sh/kiosk/kube/pkg/apis/rbac/v1"
rbacv1 "k8s.io/api/rbac/v1"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down Expand Up @@ -352,4 +352,4 @@ func (r *StaticRoles) ListRoleBindings(namespace string) ([]*rbacv1.RoleBinding,

func (r *StaticRoles) ListClusterRoleBindings() ([]*rbacv1.ClusterRoleBinding, error) {
return r.clusterRoleBindings, nil
}
}
8 changes: 4 additions & 4 deletions kube/plugin/pkg/admission/resourcequota/admission.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"
"time"

quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
"github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/generic"
resourcequotaapi "github.com/kiosk-sh/kiosk/kube/plugin/pkg/admission/resourcequota/apis/resourcequota"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"github.com/loft-sh/kiosk/kube/pkg/quota/v1/generic"
resourcequotaapi "github.com/loft-sh/kiosk/kube/plugin/pkg/admission/resourcequota/apis/resourcequota"
corev1 "k8s.io/api/core/v1"
"k8s.io/apiserver/pkg/admission"
genericadmissioninitializer "k8s.io/apiserver/pkg/admission/initializer"
Expand Down Expand Up @@ -120,4 +120,4 @@ func (a *QuotaAdmission) Validate(ctx context.Context, attr admission.Attributes
return nil
}
return a.evaluator.Evaluate(attr)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package validation
import (
"k8s.io/apimachinery/pkg/util/validation/field"

resourcequotaapi "github.com/kiosk-sh/kiosk/kube/plugin/pkg/admission/resourcequota/apis/resourcequota"
resourcequotaapi "github.com/loft-sh/kiosk/kube/plugin/pkg/admission/resourcequota/apis/resourcequota"
)

// ValidateConfiguration validates the configuration.
Expand Down
8 changes: 4 additions & 4 deletions kube/plugin/pkg/admission/resourcequota/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

"k8s.io/klog"

quota "github.com/kiosk-sh/kiosk/kube/pkg/quota/v1"
"github.com/kiosk-sh/kiosk/kube/pkg/quota/v1/generic"
resourcequotaapi "github.com/kiosk-sh/kiosk/kube/plugin/pkg/admission/resourcequota/apis/resourcequota"
quota "github.com/loft-sh/kiosk/kube/pkg/quota/v1"
"github.com/loft-sh/kiosk/kube/pkg/quota/v1/generic"
resourcequotaapi "github.com/loft-sh/kiosk/kube/plugin/pkg/admission/resourcequota/apis/resourcequota"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down Expand Up @@ -711,4 +711,4 @@ func hasUsageStats(resourceQuota *corev1.ResourceQuota, interestingResources []c
}
}
return true
}
}
6 changes: 3 additions & 3 deletions kube/plugin/pkg/auth/authorizer/rbac/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"k8s.io/klog"

rbacv1helpers "github.com/kiosk-sh/kiosk/kube/pkg/apis/rbac/v1"
rbacregistryvalidation "github.com/kiosk-sh/kiosk/kube/pkg/registry/rbac/validation"
rbacv1helpers "github.com/loft-sh/kiosk/kube/pkg/apis/rbac/v1"
rbacregistryvalidation "github.com/loft-sh/kiosk/kube/pkg/registry/rbac/validation"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/labels"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
Expand Down Expand Up @@ -218,4 +218,4 @@ type ClusterRoleBindingLister struct {

func (l *ClusterRoleBindingLister) ListClusterRoleBindings() ([]*rbacv1.ClusterRoleBinding, error) {
return l.Lister.List(labels.Everything())
}
}
2 changes: 1 addition & 1 deletion pkg/apis/config/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ limitations under the License.
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
// +groupName=config.kiosk.sh
package v1alpha1 // import "github.com/kiosk-sh/kiosk/pkg/apis/config/v1alpha1"
package v1alpha1 // import "github.com/loft-sh/kiosk/pkg/apis/config/v1alpha1"
6 changes: 3 additions & 3 deletions pkg/apis/config/validation/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package validation
import (
"reflect"

"github.com/kiosk-sh/kiosk/pkg/constants"
"github.com/loft-sh/kiosk/pkg/constants"

rbac "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/validation"
"k8s.io/apimachinery/pkg/util/validation/field"

configv1alpha1 "github.com/kiosk-sh/kiosk/pkg/apis/config/v1alpha1"
"github.com/kiosk-sh/kiosk/pkg/util/convert"
configv1alpha1 "github.com/loft-sh/kiosk/pkg/apis/config/v1alpha1"
"github.com/loft-sh/kiosk/pkg/util/convert"
)

func verifySubjects(account *configv1alpha1.Account) field.ErrorList {
Expand Down
Loading

0 comments on commit 3994bf1

Please sign in to comment.