rename module kuadrant-dns-operator -> dns-operator

Kuadrant · Feb 12, 2024 · a3cc2f9 · a3cc2f9
1 parent bdba5d7
commit a3cc2f9
Show file tree

Hide file tree

Showing 51 changed files with 147 additions and 143 deletions.
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
@@ -13,9 +13,9 @@ env:
   IMG_TAGS: ${{ github.sha }} ${{ github.ref_name }}
   IMG_REGISTRY_HOST: quay.io
   IMG_REGISTRY_ORG: kuadrant
-  IMG_REGISTRY_REPO: kuadrant-dns-operator
+  IMG_REGISTRY_REPO: dns-operator
   MAIN_BRANCH_NAME: main
-  OPERATOR_NAME: kuadrant-dns-operator
+  OPERATOR_NAME: dns-operator
 
 jobs:
   build:

diff --git a/Makefile b/Makefile
@@ -28,8 +28,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
-# quay.io/kuadrant/kuadrant-dns-operator-bundle:$VERSION and quay.io/kuadrant/kuadrant-dns-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= quay.io/kuadrant/kuadrant-dns-operator
+# quay.io/kuadrant/dns-operator-bundle:$VERSION and quay.io/kuadrant/dns-operator-catalog:$VERSION.
+IMAGE_TAG_BASE ?= quay.io/kuadrant/dns-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>)
@@ -118,7 +118,7 @@ lint: ## Run golangci-lint against code.
 
 .PHONY: imports
 imports: openshift-goimports ## Run openshift goimports against code.
-	$(OPENSHIFT_GOIMPORTS) -m github.com/kuadrant/kuadrant-dns-operator -i github.com/kuadrant
+	$(OPENSHIFT_GOIMPORTS) -m github.com/kuadrant/dns-operator -i github.com/kuadrant
 
 .PHONY: test
 test: test-unit test-integration ## Run tests.

diff --git a/PROJECT b/PROJECT
@@ -8,31 +8,31 @@ layout:
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
-projectName: kuadrant-dns-operator
-repo: github.com/kuadrant/kuadrant-dns-operator
+projectName: dns-operator
+repo: github.com/kuadrant/dns-operator
 resources:
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: kuadrant.io
   kind: ManagedZone
-  path: github.com/kuadrant/kuadrant-dns-operator/api/v1alpha1
+  path: github.com/kuadrant/dns-operator/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: kuadrant.io
   kind: DNSRecord
-  path: github.com/kuadrant/kuadrant-dns-operator/api/v1alpha1
+  path: github.com/kuadrant/dns-operator/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: kuadrant.io
   kind: DNSHealthCheckProbe
-  path: github.com/kuadrant/kuadrant-dns-operator/api/v1alpha1
+  path: github.com/kuadrant/dns-operator/api/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# kuadrant-dns-operator
+# dns-operator
 // TODO(user): Add simple overview of use/purpose
 
 ## Description
@@ -18,13 +18,13 @@ kubectl apply -f config/samples/
 2. Build and push your image to the location specified by `IMG`:
 
 ```sh
-make docker-build docker-push IMG=<some-registry>/kuadrant-dns-operator:tag
+make docker-build docker-push IMG=<some-registry>/dns-operator:tag
 ```
 
 3. Deploy the controller to the cluster with the image specified by `IMG`:
 
 ```sh
-make deploy IMG=<some-registry>/kuadrant-dns-operator:tag
+make deploy IMG=<some-registry>/dns-operator:tag
 ```
 
 ### Uninstall CRDs

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -4,7 +4,7 @@ FROM scratch
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
-LABEL operators.operatorframework.io.bundle.package.v1=kuadrant-dns-operator
+LABEL operators.operatorframework.io.bundle.package.v1=dns-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1

diff --git a/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml b/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml
@@ -4,13 +4,13 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: kuadrant-dns-operator
+    app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: controller-manager-metrics-service
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: service
-    app.kubernetes.io/part-of: kuadrant-dns-operator
+    app.kubernetes.io/part-of: dns-operator
     control-plane: controller-manager
-  name: kuadrant-dns-operator-controller-manager-metrics-service
+  name: dns-operator-controller-manager-metrics-service
 spec:
   ports:
   - name: https

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -4,12 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: kuadrant-dns-operator
+    app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: metrics-reader
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/part-of: kuadrant-dns-operator
-  name: kuadrant-dns-operator-metrics-reader
+    app.kubernetes.io/part-of: dns-operator
+  name: dns-operator-metrics-reader
 rules:
 - nonResourceURLs:
   - /metrics

diff --git a/...t-dns-operator.clusterserviceversion.yaml → ...s/dns-operator.clusterserviceversion.yaml b/...t-dns-operator.clusterserviceversion.yaml → ...s/dns-operator.clusterserviceversion.yaml
@@ -9,11 +9,11 @@ metadata:
           "kind": "DNSHealthCheckProbe",
           "metadata": {
             "labels": {
-              "app.kubernetes.io/created-by": "kuadrant-dns-operator",
+              "app.kubernetes.io/created-by": "dns-operator",
               "app.kubernetes.io/instance": "dnshealthcheckprobe-sample",
               "app.kubernetes.io/managed-by": "kustomize",
               "app.kubernetes.io/name": "dnshealthcheckprobe",
-              "app.kubernetes.io/part-of": "kuadrant-dns-operator"
+              "app.kubernetes.io/part-of": "dns-operator"
             },
             "name": "dnshealthcheckprobe-sample"
           },
@@ -24,11 +24,11 @@ metadata:
           "kind": "DNSRecord",
           "metadata": {
             "labels": {
-              "app.kubernetes.io/created-by": "kuadrant-dns-operator",
+              "app.kubernetes.io/created-by": "dns-operator",
               "app.kubernetes.io/instance": "dnsrecord-sample",
               "app.kubernetes.io/managed-by": "kustomize",
               "app.kubernetes.io/name": "dnsrecord",
-              "app.kubernetes.io/part-of": "kuadrant-dns-operator"
+              "app.kubernetes.io/part-of": "dns-operator"
             },
             "name": "dnsrecord-sample"
           },
@@ -54,11 +54,11 @@ metadata:
           "kind": "ManagedZone",
           "metadata": {
             "labels": {
-              "app.kubernetes.io/created-by": "kuadrant-dns-operator",
+              "app.kubernetes.io/created-by": "dns-operator",
               "app.kubernetes.io/instance": "managedzone-sample",
               "app.kubernetes.io/managed-by": "kustomize",
               "app.kubernetes.io/name": "managedzone",
-              "app.kubernetes.io/part-of": "kuadrant-dns-operator"
+              "app.kubernetes.io/part-of": "dns-operator"
             },
             "name": "managedzone-sample"
           },
@@ -69,10 +69,10 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-02-08T09:42:33Z"
+    createdAt: "2024-02-12T11:25:42Z"
     operators.operatorframework.io/builder: operator-sdk-v1.33.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
-  name: kuadrant-dns-operator.v0.0.0
+  name: dns-operator.v0.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -94,8 +94,8 @@ spec:
       kind: ManagedZone
       name: managedzones.kuadrant.io
       version: v1alpha1
-  description: Kuadrant DNS Operator
-  displayName: Kuadrant DNS Operator
+  description: DNS Operator
+  displayName: DNS Operator
   icon:
   - base64data: ""
     mediatype: ""
@@ -203,29 +203,29 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: kuadrant-dns-operator-controller-manager
+        serviceAccountName: dns-operator-controller-manager
       deployments:
       - label:
           app.kubernetes.io/component: manager
-          app.kubernetes.io/created-by: kuadrant-dns-operator
+          app.kubernetes.io/created-by: dns-operator
           app.kubernetes.io/instance: controller-manager
           app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: deployment
-          app.kubernetes.io/part-of: kuadrant-dns-operator
-          control-plane: kuadrant-dns-operator-controller-manager
-        name: kuadrant-dns-operator-controller-manager
+          app.kubernetes.io/part-of: dns-operator
+          control-plane: dns-operator-controller-manager
+        name: dns-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: kuadrant-dns-operator-controller-manager
+              control-plane: dns-operator-controller-manager
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: kuadrant-dns-operator-controller-manager
+                control-plane: dns-operator-controller-manager
             spec:
               containers:
               - args:
@@ -257,7 +257,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: quay.io/kuadrant/kuadrant-dns-operator:latest
+                image: quay.io/kuadrant/dns-operator:latest
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -285,7 +285,7 @@ spec:
                     - ALL
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: kuadrant-dns-operator-controller-manager
+              serviceAccountName: dns-operator-controller-manager
               terminationGracePeriodSeconds: 10
       permissions:
       - rules:
@@ -320,7 +320,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: kuadrant-dns-operator-controller-manager
+        serviceAccountName: dns-operator-controller-manager
     strategy: deployment
   installModes:
   - supported: false
@@ -334,13 +334,15 @@ spec:
   keywords:
   - dns
   links:
-  - name: Kuadrant DNS Operator
-    url: https://kuadrant-dns-operator.domain
+  - name: DNS Operator
+    url: https://dns-operator.domain
   maintainers:
   - email: [email protected]
     name: Michael Nairn
   - email: [email protected]
     name: Phil Brookes
+  - email: [email protected]
+    name: Craig Brookes
   maturity: alpha
   provider:
     name: Red Hat

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -3,7 +3,7 @@ annotations:
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
-  operators.operatorframework.io.bundle.package.v1: kuadrant-dns-operator
+  operators.operatorframework.io.bundle.package.v1: dns-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1

diff --git a/cmd/main.go b/cmd/main.go
@@ -31,12 +31,12 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	kuadrantiov1alpha1 "github.com/kuadrant/kuadrant-dns-operator/api/v1alpha1"
-	"github.com/kuadrant/kuadrant-dns-operator/internal/controller"
-	"github.com/kuadrant/kuadrant-dns-operator/internal/health"
-	"github.com/kuadrant/kuadrant-dns-operator/internal/provider"
-	_ "github.com/kuadrant/kuadrant-dns-operator/internal/provider/aws"
-	_ "github.com/kuadrant/kuadrant-dns-operator/internal/provider/google"
+	"github.com/kuadrant/dns-operator/api/v1alpha1"
+	"github.com/kuadrant/dns-operator/internal/controller"
+	"github.com/kuadrant/dns-operator/internal/health"
+	"github.com/kuadrant/dns-operator/internal/provider"
+	_ "github.com/kuadrant/dns-operator/internal/provider/aws"
+	_ "github.com/kuadrant/dns-operator/internal/provider/google"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -48,7 +48,7 @@ var (
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
-	utilruntime.Must(kuadrantiov1alpha1.AddToScheme(scheme))
+	utilruntime.Must(v1alpha1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: kuadrant-dns-operator-system
+namespace: dns-operator-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: kuadrant-dns-operator-
+namePrefix: dns-operator-
 
 # Labels to add to all resources and selectors.
 #labels:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: quay.io/kuadrant/kuadrant-dns-operator
+  newName: quay.io/kuadrant/dns-operator
   newTag: latest
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -2,12 +2,12 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: kuadrant-dns-operator-controller-manager
+    control-plane: dns-operator-controller-manager
     app.kubernetes.io/name: namespace
     app.kubernetes.io/instance: system
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: kuadrant-dns-operator
-    app.kubernetes.io/part-of: kuadrant-dns-operator
+    app.kubernetes.io/created-by: dns-operator
+    app.kubernetes.io/part-of: dns-operator
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
@@ -17,24 +17,24 @@ metadata:
   name: controller-manager
   namespace: system
   labels:
-    control-plane: kuadrant-dns-operator-controller-manager
+    control-plane: dns-operator-controller-manager
     app.kubernetes.io/name: deployment
     app.kubernetes.io/instance: controller-manager
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: kuadrant-dns-operator
-    app.kubernetes.io/part-of: kuadrant-dns-operator
+    app.kubernetes.io/created-by: dns-operator
+    app.kubernetes.io/part-of: dns-operator
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      control-plane: kuadrant-dns-operator-controller-manager
+      control-plane: dns-operator-controller-manager
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: kuadrant-dns-operator-controller-manager
+        control-plane: dns-operator-controller-manager
     spec:
       securityContext:
         runAsNonRoot: true