Merge pull request #11 from Kuadrant/update-internal-links

fix internal links: 3scale -> kuadrant
Kuadrant · Sep 28, 2021 · 6b8fa93 · 6b8fa93
2 parents 53f6fb2 + e06001a
commit 6b8fa93
Show file tree

Hide file tree

Showing 32 changed files with 117 additions and 73 deletions.
diff --git a/Makefile b/Makefile
@@ -31,8 +31,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # This variable is used to construct full image tags for bundle and catalog images.
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# 3scale.net/limitador-operator-bundle:$VERSION and 3scale.net/limitador-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= 3scale.net/limitador-operator
+# kuadrant.io/limitador-operator-bundle:$VERSION and kuadrant.io/limitador-operator-catalog:$VERSION.
+IMAGE_TAG_BASE ?= https://quay.io/repository/3scale/limitador-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)

diff --git a/PROJECT b/PROJECT
@@ -1,28 +1,28 @@
-domain: 3scale.net
+domain: kuadrant.io
 layout:
 - go.kubebuilder.io/v3
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: limitador-operator
-repo: github.com/3scale/limitador-operator
+repo: github.com/kuadrant/limitador-operator
 resources:
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
-  domain: 3scale.net
-  group: limitador.3scale.net
+  domain: kuadrant.io
+  group: limitador.kuadrant.io
   kind: Limitador
-  path: github.com/3scale/limitador-operator/api/v1alpha1
+  path: github.com/kuadrant/limitador-operator/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
-  domain: 3scale.net
-  group: limitador.3scale.net
+  domain: kuadrant.io
+  group: limitador.kuadrant.io
   kind: RateLimit
-  path: github.com/3scale/limitador-operator/api/v1alpha1
+  path: github.com/kuadrant/limitador-operator/api/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1alpha1 contains API Schema definitions for the limitador v1alpha1 API group
 //+kubebuilder:object:generate=true
-//+groupName=limitador.3scale.net
+//+groupName=limitador.kuadrant.io
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "limitador.3scale.net", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "limitador.kuadrant.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/...ases/limitador.3scale.net_limitadors.yaml → ...ses/limitador.kuadrant.io_limitadors.yaml b/...ases/limitador.3scale.net_limitadors.yaml → ...ses/limitador.kuadrant.io_limitadors.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
-  name: limitadors.limitador.3scale.net
+  name: limitadors.limitador.kuadrant.io
 spec:
-  group: limitador.3scale.net
+  group: limitador.kuadrant.io
   names:
     kind: Limitador
     listKind: LimitadorList

diff --git a/...ases/limitador.3scale.net_ratelimits.yaml → ...ses/limitador.kuadrant.io_ratelimits.yaml b/...ases/limitador.3scale.net_ratelimits.yaml → ...ses/limitador.kuadrant.io_ratelimits.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
-  name: ratelimits.limitador.3scale.net
+  name: ratelimits.limitador.kuadrant.io
 spec:
-  group: limitador.3scale.net
+  group: limitador.kuadrant.io
   names:
     kind: RateLimit
     listKind: RateLimitList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,8 +2,8 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/limitador.3scale.net_ratelimits.yaml
-- bases/limitador.3scale.net_limitadors.yaml
+- bases/limitador.kuadrant.io_ratelimits.yaml
+- bases/limitador.kuadrant.io_limitadors.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_limitadors.yaml b/config/crd/patches/cainjection_in_limitadors.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: limitadors.limitador.3scale.net
+  name: limitadors.limitador.kuadrant.io
diff --git a/config/crd/patches/cainjection_in_ratelimits.yaml b/config/crd/patches/cainjection_in_ratelimits.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: ratelimits.limitador.3scale.net
+  name: ratelimits.limitador.kuadrant.io
diff --git a/config/crd/patches/webhook_in_limitadors.yaml b/config/crd/patches/webhook_in_limitadors.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: limitadors.limitador.3scale.net
+  name: limitadors.limitador.kuadrant.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/crd/patches/webhook_in_ratelimits.yaml b/config/crd/patches/webhook_in_ratelimits.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ratelimits.limitador.3scale.net
+  name: ratelimits.limitador.kuadrant.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
@@ -8,4 +8,4 @@ webhook:
   port: 9443
 leaderElection:
   leaderElect: true
-  resourceName: 3745a16e.3scale.net
+  resourceName: 3745a16e.kuadrant.io
diff --git a/config/manifests/bases/limitador-operator.clusterserviceversion.yaml b/config/manifests/bases/limitador-operator.clusterserviceversion.yaml
@@ -0,0 +1,43 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: '[]'
+    capabilities: Basic Install
+  name: limitador-operator.v0.0.0
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions: {}
+  description: The Limitador operator installs and maintains limitador instances as well as rate limit objects.
+  displayName: Limitador
+  icon:
+  - base64data: ""
+    mediatype: ""
+  install:
+    spec:
+      deployments: null
+    strategy: ""
+  installModes:
+  - supported: false
+    type: OwnNamespace
+  - supported: false
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
+  keywords:
+  - api
+  - rate-limit
+  links:
+  - name: Limitador Operator
+    url: https://limitador-operator.domain
+  maintainers:
+  - email: [email protected]
+    name: eguzki
+  maturity: alpha
+  provider:
+    name: Red Hat
+    url: https://github.com/Kuadrant/limitador-operator
+  version: 0.0.0
diff --git a/config/rbac/limitador_editor_role.yaml b/config/rbac/limitador_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: limitador-editor-role
 rules:
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - limitadors
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - limitadors/status
   verbs:

diff --git a/config/rbac/limitador_viewer_role.yaml b/config/rbac/limitador_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: limitador-viewer-role
 rules:
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - limitadors
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - limitadors/status
   verbs:

diff --git a/config/rbac/ratelimit_editor_role.yaml b/config/rbac/ratelimit_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: ratelimit-editor-role
 rules:
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - ratelimits
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - ratelimits/status
   verbs:

diff --git a/config/rbac/ratelimit_viewer_role.yaml b/config/rbac/ratelimit_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: ratelimit-viewer-role
 rules:
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - ratelimits
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - ratelimits/status
   verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -29,7 +29,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - limitadors
   verbs:
@@ -41,21 +41,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - limitadors/finalizers
   verbs:
   - update
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - limitadors/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - ratelimits
   verbs:
@@ -67,13 +67,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - ratelimits/finalizers
   verbs:
   - update
 - apiGroups:
-  - limitador.3scale.net
+  - limitador.kuadrant.io
   resources:
   - ratelimits/status
   verbs:

diff --git a/config/samples/limitador_v1alpha1_limitador.yaml b/config/samples/limitador_v1alpha1_limitador.yaml
@@ -1,4 +1,4 @@
-apiVersion: limitador.3scale.net/v1alpha1
+apiVersion: limitador.kuadrant.io/v1alpha1
 kind: Limitador
 metadata:
   name: limitador-sample

diff --git a/config/samples/limitador_v1alpha1_ratelimit.yaml b/config/samples/limitador_v1alpha1_ratelimit.yaml
@@ -1,4 +1,4 @@
-apiVersion: limitador.3scale.net/v1alpha1
+apiVersion: limitador.kuadrant.io/v1alpha1
 kind: RateLimit
 metadata:
   name: ratelimit-sample

diff --git a/controllers/limitador_controller.go b/controllers/limitador_controller.go
@@ -25,19 +25,19 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	limitadorv1alpha1 "github.com/3scale/limitador-operator/api/v1alpha1"
-	"github.com/3scale/limitador-operator/pkg/limitador"
-	"github.com/3scale/limitador-operator/pkg/reconcilers"
+	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
+	"github.com/kuadrant/limitador-operator/pkg/limitador"
+	"github.com/kuadrant/limitador-operator/pkg/reconcilers"
 )
 
 // LimitadorReconciler reconciles a Limitador object
 type LimitadorReconciler struct {
 	*reconcilers.BaseReconciler
 }
 
-//+kubebuilder:rbac:groups=limitador.3scale.net,resources=limitadors,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=limitador.3scale.net,resources=limitadors/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=limitador.3scale.net,resources=limitadors/finalizers,verbs=update
+//+kubebuilder:rbac:groups=limitador.kuadrant.io,resources=limitadors,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=limitador.kuadrant.io,resources=limitadors/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=limitador.kuadrant.io,resources=limitadors/finalizers,verbs=update
 //+kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;delete
 //+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;delete
 

diff --git a/controllers/limitador_controller_test.go b/controllers/limitador_controller_test.go
@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"context"
+	"time"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
@@ -11,10 +13,9 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"time"
 
-	limitadorv1alpha1 "github.com/3scale/limitador-operator/api/v1alpha1"
-	"github.com/3scale/limitador-operator/pkg/limitador"
+	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
+	"github.com/kuadrant/limitador-operator/pkg/limitador"
 )
 
 var _ = Describe("Limitador controller", func() {
@@ -37,7 +38,7 @@ var _ = Describe("Limitador controller", func() {
 		return &limitadorv1alpha1.Limitador{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "Limitador",
-				APIVersion: "limitador.3scale.net/v1alpha1",
+				APIVersion: "limitador.kuadrant.io/v1alpha1",
 			},
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      name,