Fix descriptor & editor for new-dbs

Signed-off-by: Arnob kumar saha <[email protected]>
kubeops · Oct 24, 2024 · 2e14c99 · 2e14c99
1 parent 731920d
commit 2e14c99
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 55 deletions.
diff --git a/go.mod b/go.mod
@@ -50,7 +50,7 @@ require (
 	kmodules.xyz/go-containerregistry v0.0.12
 	kmodules.xyz/monitoring-agent-api v0.30.2
 	kmodules.xyz/offshoot-api v0.30.1
-	kmodules.xyz/resource-metadata v0.20.1-0.20241023065426-3eebc133ebfb
+	kmodules.xyz/resource-metadata v0.20.1-0.20241024141255-d6ea0912c801
 	kmodules.xyz/resource-metrics v0.30.4
 	kmodules.xyz/resource-metrics/utils v0.30.4
 	kmodules.xyz/sets v0.29.0

diff --git a/go.sum b/go.sum
@@ -934,8 +934,8 @@ kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+a
 kmodules.xyz/monitoring-agent-api v0.30.2/go.mod h1:BoZFPDDRB7J39CcUsSDlzgW8PQCwik4ILPleyUob+Mg=
 kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
 kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
-kmodules.xyz/resource-metadata v0.20.1-0.20241023065426-3eebc133ebfb h1:X5HgQQwpeyJm6u0g5hBlsDF46NGQXvS8w+lfwsebK0k=
-kmodules.xyz/resource-metadata v0.20.1-0.20241023065426-3eebc133ebfb/go.mod h1:xmYpw8x7MJdEUWsD4kPE0oL4ulyXyAzmaDZNGljNd/E=
+kmodules.xyz/resource-metadata v0.20.1-0.20241024141255-d6ea0912c801 h1:LxN23ty9a/PisKL7xVf/mXxUWOcxpvpjndozUsJHbOc=
+kmodules.xyz/resource-metadata v0.20.1-0.20241024141255-d6ea0912c801/go.mod h1:xmYpw8x7MJdEUWsD4kPE0oL4ulyXyAzmaDZNGljNd/E=
 kmodules.xyz/resource-metrics v0.30.4 h1:8HBPtYmo9ETY91gsc55JE8Z986+3ZuRq57M0wZ9npqI=
 kmodules.xyz/resource-metrics v0.30.4/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ=
 kmodules.xyz/resource-metrics/utils v0.30.4 h1:bJS/x0Qr7N1FFdxugFbzZ/Es6HVs4ptsFlhkmgj3jac=

diff --git a/...or/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/druids.yaml b/...or/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/druids.yaml
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Druid.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Druid.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/...kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/ferretdbs.yaml b/...kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/ferretdbs.yaml
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~FerretDB.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~FerretDB.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/...dules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml b/...dules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~MSSQLServer.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~MSSQLServer.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/...r/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/pgpools.yaml b/...r/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/pgpools.yaml
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Pgpool.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Pgpool.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/...kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/rabbitmqs.yaml b/...kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/rabbitmqs.yaml
@@ -40,7 +40,7 @@ spec:
     - '{.spec.version}'
     target:
       apiVersion: catalog.kubedb.com/v1alpha1
-      kind: KafkaVersion
+      kind: RabbitMQVersion
     type: MatchRef
   - labels:
     - cert_issuer
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~RabbitMQ.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~RabbitMQ.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/...dules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/singlestores.yaml b/...dules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/singlestores.yaml
@@ -40,7 +40,7 @@ spec:
     - '{.spec.version}'
     target:
       apiVersion: catalog.kubedb.com/v1alpha1
-      kind: KafkaVersion
+      kind: SinglestoreVersion
     type: MatchRef
   - labels:
     - cert_issuer
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Singlestore.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Singlestore.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml
@@ -40,7 +40,7 @@ spec:
     - '{.spec.version}'
     target:
       apiVersion: catalog.kubedb.com/v1alpha1
-      kind: KafkaVersion
+      kind: SolrVersion
     type: MatchRef
   - labels:
     - cert_issuer
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Solr.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~Solr.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/...modules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/zookeepers.yaml b/...modules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/zookeepers.yaml
@@ -40,7 +40,7 @@ spec:
     - '{.spec.version}'
     target:
       apiVersion: catalog.kubedb.com/v1alpha1
-      kind: KafkaVersion
+      kind: ZooKeeperVersion
     type: MatchRef
   - labels:
     - cert_issuer
@@ -62,7 +62,7 @@ spec:
     type: MatchRef
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~ZooKeeper.kubedb.com'
     namespace:
       path: metadata.namespace
     target:
@@ -71,7 +71,7 @@ spec:
     type: MatchName
   - labels:
     - view
-    nameTemplate: '{.metadata.name}~Kafka.kubedb.com'
+    nameTemplate: '{.metadata.name}~ZooKeeper.kubedb.com'
     namespace:
       path: metadata.namespace
     target:

diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1/kafkas.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1/kafkas.yaml
@@ -68,7 +68,7 @@ spec:
       name: Operations
     - items:
       - disabledTemplate: |
-          {{ not (gt .spec.replicas 1) }}
+          {{ not (or (hasKey .spec "topology") (gt .spec.replicas 1) )}}
         editor:
           name: opskubedbcom-kafkaopsrequest-editor
           sourceRef:

diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1/redises.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1/redises.yaml
@@ -98,7 +98,7 @@ spec:
       name: Operations
     - items:
       - disabledTemplate: |
-          {{ not (gt .spec.replicas 1) }}
+          {{ not (or (eq .spec.mode "Cluster") (gt .spec.replicas 1) )}}
         editor:
           name: opskubedbcom-redisopsrequest-editor
           sourceRef:

diff --git a/...r/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/clickhouses.yaml b/...r/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/clickhouses.yaml
@@ -24,7 +24,7 @@ spec:
     actions:
     - items:
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-clickhouseopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -38,7 +38,7 @@ spec:
         name: Restart
         operationId: create-opsrequest-restart
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-clickhouseopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -56,7 +56,7 @@ spec:
       - disabledTemplate: |
           {{ not (gt .spec.replicas 1) }}
         editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-clickhouseopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -70,7 +70,7 @@ spec:
         name: Horizontal Scale
         operationId: create-opsrequest-horizontalscaling
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-clickhouseopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -84,7 +84,7 @@ spec:
         name: Vertical Scale
         operationId: create-opsrequest-verticalscaling
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-clickhouseopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository

diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/druids.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/druids.yaml
@@ -24,7 +24,7 @@ spec:
     actions:
     - items:
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-druidopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -38,7 +38,7 @@ spec:
         name: Restart
         operationId: create-opsrequest-restart
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-druidopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -53,10 +53,8 @@ spec:
         operationId: create-opsrequest-reconfigure
       name: Operations
     - items:
-      - disabledTemplate: |
-          {{ not (gt .spec.replicas 1) }}
-        editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+      - editor:
+          name: opskubedbcom-druidopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -70,7 +68,7 @@ spec:
         name: Horizontal Scale
         operationId: create-opsrequest-horizontalscaling
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-druidopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository

diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/ferretdbs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/ferretdbs.yaml
@@ -24,7 +24,7 @@ spec:
     actions:
     - items:
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-ferretdbopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -38,7 +38,7 @@ spec:
         name: Restart
         operationId: create-opsrequest-restart
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-ferretdbopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -56,7 +56,7 @@ spec:
       - disabledTemplate: |
           {{ not (gt .spec.replicas 1) }}
         editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-ferretdbopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -70,7 +70,7 @@ spec:
         name: Horizontal Scale
         operationId: create-opsrequest-horizontalscaling
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-ferretdbopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -84,7 +84,7 @@ spec:
         name: Vertical Scale
         operationId: create-opsrequest-verticalscaling
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-ferretdbopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository
@@ -100,7 +100,7 @@ spec:
       name: Scaling
     - items:
       - editor:
-          name: opskubedbcom-mysqlopsrequest-editor
+          name: opskubedbcom-ferretdbopsrequest-editor
           sourceRef:
             apiGroup: source.toolkit.fluxcd.io
             kind: HelmRepository