Merge pull request #15 from lburgazzoli/bundles

fix bundle generation scripts and manifests
dapr · Aug 31, 2023 · 6409273 · 6409273
2 parents 6ef76d0 + fb3af6c
commit 6409273
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/PROJECT b/PROJECT
@@ -6,16 +6,16 @@ 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:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: dapr.io
-  group: tools
-  kind: Dapr
-  path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/tools/v1alpha1
+  group: operator
+  kind: DaprControlPlane
+  path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/api/operator/v1alpha1/zz_generated.deepcopy.go b/api/operator/v1alpha1/zz_generated.deepcopy.go
diff --git 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/...pr-operator-ng.clusterserviceversion.yaml → ...netes-operator.clusterserviceversion.yaml b/...pr-operator-ng.clusterserviceversion.yaml → ...netes-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
@@ -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
@@ -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
@@ -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
@@ -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