Skip to content

Commit

Permalink
refactor: moving to new neutral organization
Browse files Browse the repository at this point in the history
Signed-off-by: Dario Tranchitella <[email protected]>
  • Loading branch information
prometherion committed Oct 16, 2023
1 parent d6ca71d commit d7a48d7
Show file tree
Hide file tree
Showing 162 changed files with 352 additions and 352 deletions.
16 changes: 8 additions & 8 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: capsule
repo: github.com/clastix/capsule
repo: github.com/projectcapsule/capsule
resources:
- api:
crdVersion: v1
controller: true
domain: clastix.io
group: capsule
kind: Tenant
path: github.com/clastix/capsule/api/v1alpha1
path: github.com/projectcapsule/capsule/api/v1alpha1
version: v1alpha1
webhooks:
conversion: true
Expand All @@ -24,43 +24,43 @@ resources:
domain: clastix.io
group: capsule
kind: CapsuleConfiguration
path: github.com/clastix/capsule/api/v1alpha1
path: github.com/projectcapsule/capsule/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
domain: clastix.io
group: capsule
kind: Tenant
path: github.com/clastix/capsule/api/v1beta1
path: github.com/projectcapsule/capsule/api/v1beta1
version: v1beta1
- api:
crdVersion: v1
domain: clastix.io
group: capsule
kind: Tenant
path: github.com/clastix/capsule/api/v1beta2
path: github.com/projectcapsule/capsule/api/v1beta2
version: v1beta2
- api:
crdVersion: v1
controller: true
domain: clastix.io
group: capsule
kind: CapsuleConfiguration
path: github.com/clastix/capsule/api/v1beta2
path: github.com/projectcapsule/capsule/api/v1beta2
version: v1beta2
- api:
crdVersion: v1
namespaced: true
domain: clastix.io
group: capsule
kind: TenantResource
path: github.com/clastix/capsule/api/v1beta2
path: github.com/projectcapsule/capsule/api/v1beta2
version: v1beta2
- api:
crdVersion: v1
domain: clastix.io
group: capsule
kind: GlobalTenantResource
path: github.com/clastix/capsule/api/v1beta2
path: github.com/projectcapsule/capsule/api/v1beta2
version: v1beta2
version: "3"
4 changes: 2 additions & 2 deletions api/v1alpha1/conversion_hub.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/conversion"

capsulev1beta1 "github.com/clastix/capsule/api/v1beta1"
"github.com/clastix/capsule/pkg/api"
capsulev1beta1 "github.com/projectcapsule/capsule/api/v1beta1"
"github.com/projectcapsule/capsule/pkg/api"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/conversion_hub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"

capsulev1beta1 "github.com/clastix/capsule/api/v1beta1"
"github.com/clastix/capsule/pkg/api"
capsulev1beta1 "github.com/projectcapsule/capsule/api/v1beta1"
"github.com/projectcapsule/capsule/pkg/api"
)

//nolint:maintidx
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/tenant_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

// TenantSpec defines the desired state of Tenant.
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1beta1/ingress_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package v1beta1

import (
"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

type IngressOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/namespace_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package v1beta1
import (
"strings"

"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

type NamespaceOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/service_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package v1beta1

import (
"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

type ServiceOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/tenant_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package v1beta1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

// TenantSpec defines the desired state of Tenant.
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1beta2/capsuleconfiguration_convertion_hub.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"sigs.k8s.io/controller-runtime/pkg/conversion"

capsulev1alpha1 "github.com/clastix/capsule/api/v1alpha1"
capsulev1alpha1 "github.com/projectcapsule/capsule/api/v1alpha1"
)

func (in *CapsuleConfiguration) ConvertTo(raw conversion.Hub) error {
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/capsuleconfiguration_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

// CapsuleConfigurationSpec defines the Capsule configuration.
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/ingress_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package v1beta2

import (
"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

type IngressOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/namespace_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package v1beta2

import (
"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

type NamespaceOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta2/tenant_conversion_hub.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"sigs.k8s.io/controller-runtime/pkg/conversion"

capsulev1beta1 "github.com/clastix/capsule/api/v1beta1"
"github.com/clastix/capsule/pkg/api"
capsulev1beta1 "github.com/projectcapsule/capsule/api/v1beta1"
"github.com/projectcapsule/capsule/pkg/api"
)

func (in *Tenant) ConvertFrom(raw conversion.Hub) error {
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/tenant_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

// TenantSpec defines the desired state of Tenant.
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/tenantresource_namespaced.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/clastix/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/api"
)

// TenantResourceSpec defines the desired state of TenantResource.
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions controllers/config/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/controllers/utils"
"github.com/clastix/capsule/pkg/configuration"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/controllers/utils"
"github.com/projectcapsule/capsule/pkg/configuration"
)

type Manager struct {
Expand Down
6 changes: 3 additions & 3 deletions controllers/pv/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
capsuleutils "github.com/clastix/capsule/pkg/utils"
webhookutils "github.com/clastix/capsule/pkg/webhook/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
capsuleutils "github.com/projectcapsule/capsule/pkg/utils"
webhookutils "github.com/projectcapsule/capsule/pkg/webhook/utils"
)

type Controller struct {
Expand Down
6 changes: 3 additions & 3 deletions controllers/rbac/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/controllers/utils"
"github.com/clastix/capsule/pkg/configuration"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/controllers/utils"
"github.com/projectcapsule/capsule/pkg/configuration"
)

type Manager struct {
Expand Down
2 changes: 1 addition & 1 deletion controllers/resources/global.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
)

type Global struct {
Expand Down
2 changes: 1 addition & 1 deletion controllers/resources/namespaced.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
)

type Namespaced struct {
Expand Down
2 changes: 1 addition & 1 deletion controllers/resources/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/servicelabels/abstract.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/pkg/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/pkg/utils"
)

type abstractServiceLabelsReconciler struct {
Expand Down
4 changes: 2 additions & 2 deletions controllers/tenant/limitranges.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/pkg/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/pkg/utils"
)

// Ensuring all the LimitRange are applied to each Namespace handled by the Tenant.
Expand Down
2 changes: 1 addition & 1 deletion controllers/tenant/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
)

type Manager struct {
Expand Down
6 changes: 3 additions & 3 deletions controllers/tenant/namespaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/pkg/api"
"github.com/clastix/capsule/pkg/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/utils"
)

// Ensuring all annotations are applied to each Namespace handled by the Tenant.
Expand Down
4 changes: 2 additions & 2 deletions controllers/tenant/networkpolicies.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/pkg/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/pkg/utils"
)

// Ensuring all the NetworkPolicies are applied to each Namespace handled by the Tenant.
Expand Down
6 changes: 3 additions & 3 deletions controllers/tenant/resourcequotas.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/pkg/api"
"github.com/clastix/capsule/pkg/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/utils"
)

// When the Resource Budget assigned to a Tenant is Tenant-scoped we have to rely on the ResourceQuota resources to
Expand Down
2 changes: 1 addition & 1 deletion controllers/tenant/resourcequotas_quota.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/client-go/util/retry"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
)

func (r *Manager) syncCustomResourceQuotaUsages(ctx context.Context, tenant *capsulev1beta2.Tenant) error {
Expand Down
6 changes: 3 additions & 3 deletions controllers/tenant/rolebindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
"github.com/clastix/capsule/pkg/api"
"github.com/clastix/capsule/pkg/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
"github.com/projectcapsule/capsule/pkg/api"
"github.com/projectcapsule/capsule/pkg/utils"
)

// ownerClusterRoleBindings generates a Capsule AdditionalRoleBinding object for the Owner dynamic clusterrole in order
Expand Down
2 changes: 1 addition & 1 deletion controllers/tenant/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

capsulev1beta2 "github.com/clastix/capsule/pkg/utils"
capsulev1beta2 "github.com/projectcapsule/capsule/pkg/utils"
)

// pruningResources is taking care of removing the no more requested sub-resources as LimitRange, ResourceQuota or
Expand Down
Loading

0 comments on commit d7a48d7

Please sign in to comment.