Skip to content

Commit

Permalink
Merge branch 'main' of github.com:projectcapsule/capsule
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverbaehler committed Oct 17, 2023
2 parents 819eb1c + c30de4b commit dea24c2
Show file tree
Hide file tree
Showing 262 changed files with 911 additions and 674 deletions.
8 changes: 4 additions & 4 deletions .github/maintainers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
github: https://github.com/bsctl
company: Clastix
projects:
- https://github.com/clastix/capsule
- https://github.com/projectcapsule/capsule
- https://github.com/clastix/capsule-proxy
- name: Dario Tranchitella
github: https://github.com/prometherion
company: Clastix
projects:
- https://github.com/clastix/capsule
- https://github.com/projectcapsule/capsule
- https://github.com/clastix/capsule-proxy
- name: Maksim Fedotov
github: https://github.com/MaxFedotov
company: wargaming.net
projects:
- https://github.com/clastix/capsule
- https://github.com/projectcapsule/capsule
- https://github.com/clastix/capsule-proxy
- name: Oliver Bähler
github: https://github.com/oliverbaehler
company: Bedag Informatik AG
projects:
- https://github.com/clastix/capsule
- https://github.com/projectcapsule/capsule
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ linters-settings:
sections:
- standard
- default
- prefix(github.com/clastix/capsule)
- prefix(github.com/projectcapsule/capsule)
goheader:
template: |-
Copyright 2020-2021 Clastix Labs
Copyright 2020-2023 Project Capsule Authors.
SPDX-License-Identifier: Apache-2.0
linters:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ bundle: manifests
# Sorting imports
.PHONY: goimports
goimports:
goimports -w -l -local "github.com/clastix/capsule" .
goimports -w -l -local "github.com/projectcapsule/capsule" .

GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
golangci-lint: ## Download golangci-lint locally if necessary.
Expand Down
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"
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

<p align="left">
<img src="https://github.com/clastix/capsule/actions/workflows/ci.yml/badge.svg"/>
<img src="https://github.com/projectcapsule/capsule/actions/workflows/ci.yml/badge.svg"/>
<img src="https://img.shields.io/github/license/clastix/capsule"/>
<img src="https://img.shields.io/github/go-mod/go-version/clastix/capsule"/>
<a href="https://github.com/clastix/capsule/releases">
<a href="https://github.com/projectcapsule/capsule/releases">
<img src="https://img.shields.io/github/v/release/clastix/capsule"/>
</a>
<a href="https://charmhub.io/capsule-k8s">
Expand Down Expand Up @@ -97,7 +97,7 @@ make helm-docs

## Community

Join the community, share and learn from it. You can find all the resources to how to contribute code and docs, connect with people in the [community repository](https://github.com/clastix/capsule-community).
Join the community, share and learn from it. You can find all the resources to how to contribute code and docs, connect with people in the [community repository](https://github.com/projectcapsule/capsule-community).

Please read the [code of conduct](CODE_OF_CONDUCT.md).

Expand Down Expand Up @@ -125,7 +125,7 @@ Please, refer to the [documentation page](https://capsule.clastix.io/docs/contri

- Q. Is it production grade?

A. Although under frequent development and improvements, Capsule is ready to be used in production environments as currently, people are using it in public and private deployments. Check out the [release](https://github.com/clastix/capsule/releases) page for a detailed list of available versions.
A. Although under frequent development and improvements, Capsule is ready to be used in production environments as currently, people are using it in public and private deployments. Check out the [release](https://github.com/projectcapsule/capsule/releases) page for a detailed list of available versions.

- Q. Does it work with my Kubernetes XYZ distribution?

Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/additional_metadata.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/capsuleconfiguration_annotations.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/capsuleconfiguration_types.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/capsuleconfiguration_webhook.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand Down
6 changes: 3 additions & 3 deletions api/v1alpha1/conversion_hub.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand All @@ -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
6 changes: 3 additions & 3 deletions api/v1alpha1/conversion_hub_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand All @@ -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/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

// Package v1alpha1 contains API Schema definitions for the capsule.clastix.io v1alpha1 API group
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/owner.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/tenant_func.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/tenant_types.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand All @@ -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/tenant_webhook.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1alpha1
Expand Down
4 changes: 2 additions & 2 deletions 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/custom_resource_quota.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/deny_wildcard.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

// Package v1beta1 contains API Schema definitions for the capsule v1beta1 API group
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/ingress_options.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1

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

type IngressOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/namespace_options.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

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/owner.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/owner_list.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/owner_list_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/owner_role.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/service_allowed_types.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/service_options.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

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_func.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/tenant_status.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/tenant_types.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

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/tenant_webhook.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 Clastix Labs
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0

package v1beta1
Expand Down
Loading

0 comments on commit dea24c2

Please sign in to comment.