fix bundle generation scripts and manifests

PROJECT

@@ -6,7 +6,7 @@ domain: dapr.io
 layout:
 - go.kubebuilder.io/v4
 multigroup: true
-projectName: dapr-operator-ng
+projectName: dapr-kubernetes-operator
 repo: github.com/dapr-sandbox/dapr-kubernetes-operator
 resources:
 - api:
@@ -14,8 +14,8 @@ resources:
     namespaced: true
   controller: true
   domain: dapr.io
-  group: tools
+  group: operator
-  kind: Dapr
+  kind: DaprControlPlane
-  path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/tools/v1alpha1
+  path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
   version: v1alpha1
 version: "3"

api/operator/v1alpha1/zz_generated.deepcopy.go

@@ -22,7 +22,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 

config/manager/kustomization.yaml

@@ -8,5 +8,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ttl.sh/57e2fb88-57e2-4344-8b69-4364dd4f8b9b
+  newName: ghcr.io/dapr-sandbox/dapr-kubernetes-operator
-  newTag: 2h
+  newTag: 0.0.3

config/manifests/bases/dapr-kubernetes-operator.clusterserviceversion.yaml

@@ -3,11 +3,11 @@ kind: ClusterServiceVersion
 metadata:
   annotations:
     alm-examples: "[]"
-    capabilities: Basic Install
+    capabilities: "Basic Install"
-    categories: Dapr
+    categories: "Application Runtime"
     certified: "false"
     containerImage: ""
-  name: dapr-operator-ng.v0.0.0
+  name: dapr-kubernetes-operator.v0.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}

config/manifests/kustomization.yaml

@@ -1,7 +1,7 @@
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
-- bases/dapr-operator-ng.clusterserviceversion.yaml
+- bases/dapr-kubernetes-operator.clusterserviceversion.yaml
 - ../default
 - ../samples
 - ../scorecard

config/prometheus/monitor.yaml

@@ -6,12 +6,11 @@ metadata:
   labels:
     control-plane: dapr-control-plane
     app.kubernetes.io/name: servicemonitor
-    app.kubernetes.io/instance: dapr-controller-metrics-monitor
+    app.kubernetes.io/instance: dapr-control-plane-metrics-monitor
     app.kubernetes.io/component: metrics
-    app.kubernetes.io/created-by: dapr-operator-ng
+    app.kubernetes.io/part-of: dapr-control-plane
-    app.kubernetes.io/part-of: dapr-operator-ng
     app.kubernetes.io/managed-by: kustomize
-  name: dapr-controller-metrics-monitor
+  name: dapr-control-plane-metrics-monitor
   namespace: dapr-system
 spec:
   endpoints:

config/samples/olm/subscription.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: openshift-operators
 spec:
   channel: alpha
-  name: dapr-operator-ng
+  name: dapr-kubernetes-operator
   installPlanApproval: Automatic
   source: daprio-catalog
   sourceNamespace: openshift-marketplace

hack/scripts/gen_bundle.sh

@@ -8,7 +8,7 @@ PROJECT_ROOT="$1"
 BUNDLE_NAME="$2"
 BUNDLE_VERSION="$3"
 
-rm -rf "${PROJECT_ROOT}/bundle/dapr-operator-ng"
+rm -rf "${PROJECT_ROOT}/bundle/${BUNDLE_NAME}"
 
 mkdir -p "${PROJECT_ROOT}/bundle"
 cd "${PROJECT_ROOT}/bundle" || exit