From 43275df2a34c569890836772522b5d208dc2d688 Mon Sep 17 00:00:00 2001
From: Luca Burgazzoli <lburgazzoli@gmail.com>
Date: Thu, 24 Aug 2023 12:32:10 +0200
Subject: [PATCH] fix bundle generation scripts and manifests

---
 PROJECT                                                    | 2 +-
 api/operator/v1alpha1/zz_generated.deepcopy.go             | 2 +-
 config/manager/kustomization.yaml                          | 4 ++--
 ...=> dapr-kubernetes-operator.clusterserviceversion.yaml} | 6 +++---
 config/manifests/kustomization.yaml                        | 2 +-
 config/prometheus/monitor.yaml                             | 7 +++----
 config/samples/olm/subscription.yaml                       | 2 +-
 hack/scripts/gen_bundle.sh                                 | 2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)
 rename config/manifests/bases/{dapr-operator-ng.clusterserviceversion.yaml => dapr-kubernetes-operator.clusterserviceversion.yaml} (98%)

diff --git a/PROJECT b/PROJECT
index d7a51dc..127014f 100644
--- a/PROJECT
+++ b/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:
diff --git a/api/operator/v1alpha1/zz_generated.deepcopy.go b/api/operator/v1alpha1/zz_generated.deepcopy.go
index c53065c..8dfd983 100644
--- a/api/operator/v1alpha1/zz_generated.deepcopy.go
+++ b/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"
 )
 
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 73adc61..e266de7 100644
--- a/config/manager/kustomization.yaml
+++ b/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
-  newTag: 2h
+  newName: ghcr.io/dapr-sandbox/dapr-kubernetes-operator
+  newTag: 0.0.3
diff --git a/config/manifests/bases/dapr-operator-ng.clusterserviceversion.yaml b/config/manifests/bases/dapr-kubernetes-operator.clusterserviceversion.yaml
similarity index 98%
rename from config/manifests/bases/dapr-operator-ng.clusterserviceversion.yaml
rename to config/manifests/bases/dapr-kubernetes-operator.clusterserviceversion.yaml
index 0cf04ef..b6017dc 100644
--- a/config/manifests/bases/dapr-operator-ng.clusterserviceversion.yaml
+++ b/config/manifests/bases/dapr-kubernetes-operator.clusterserviceversion.yaml
@@ -3,11 +3,11 @@ kind: ClusterServiceVersion
 metadata:
   annotations:
     alm-examples: "[]"
-    capabilities: Basic Install
-    categories: Dapr
+    capabilities: "Basic Install"
+    categories: "Application Runtime"
     certified: "false"
     containerImage: ""
-  name: dapr-operator-ng.v0.0.0
+  name: dapr-kubernetes-operator.v0.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
index fc488c6..748dd84 100644
--- a/config/manifests/kustomization.yaml
+++ b/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
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
index 2924254..107ab30 100644
--- a/config/prometheus/monitor.yaml
+++ b/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-operator-ng
+    app.kubernetes.io/part-of: dapr-control-plane
     app.kubernetes.io/managed-by: kustomize
-  name: dapr-controller-metrics-monitor
+  name: dapr-control-plane-metrics-monitor
   namespace: dapr-system
 spec:
   endpoints:
diff --git a/config/samples/olm/subscription.yaml b/config/samples/olm/subscription.yaml
index 938e5a4..82d4c1e 100644
--- a/config/samples/olm/subscription.yaml
+++ b/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
diff --git a/hack/scripts/gen_bundle.sh b/hack/scripts/gen_bundle.sh
index 9ba86f1..5eb37d7 100755
--- a/hack/scripts/gen_bundle.sh
+++ b/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