Fix backupconfig descriptor

Signed-off-by: Tamal Saha <[email protected]>
kubeops · Aug 19, 2024 · c41db1a · c41db1a
1 parent f0a4704
commit c41db1a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/go.mod b/go.mod
@@ -48,7 +48,7 @@ require (
 	kmodules.xyz/custom-resources v0.30.0
 	kmodules.xyz/go-containerregistry v0.0.12
 	kmodules.xyz/monitoring-agent-api v0.29.0
-	kmodules.xyz/resource-metadata v0.18.11
+	kmodules.xyz/resource-metadata v0.18.12-0.20240819141406-fd6ce5e1e955
 	kmodules.xyz/resource-metrics v0.30.2
 	kmodules.xyz/resource-metrics/utils v0.30.1
 	kmodules.xyz/sets v0.29.0

diff --git a/go.sum b/go.sum
@@ -920,8 +920,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9
 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI=
 kmodules.xyz/offshoot-api v0.29.4 h1:WQV2BIUIoVKKiqZNmZ4gAy367jEdwBhEl3dFCLZM1qA=
 kmodules.xyz/offshoot-api v0.29.4/go.mod h1:e+NQ0s4gW/YTPWBWEfdISZcmk+tlTq8IjvP5SLdqvko=
-kmodules.xyz/resource-metadata v0.18.11 h1:5hLUfB2P7irq5erawXxH9Vrir+2OGRmWZjXrhBJr614=
-kmodules.xyz/resource-metadata v0.18.11/go.mod h1:/Q0zumHsVTXgS+zKyoN6+CND8M3kNUMYIAhoVrUoCAw=
+kmodules.xyz/resource-metadata v0.18.12-0.20240819141406-fd6ce5e1e955 h1:fQoLi7MeggJhXkAEawyCVKpwC+RK29k7m9I1qZaDGCM=
+kmodules.xyz/resource-metadata v0.18.12-0.20240819141406-fd6ce5e1e955/go.mod h1:/Q0zumHsVTXgS+zKyoN6+CND8M3kNUMYIAhoVrUoCAw=
 kmodules.xyz/resource-metrics v0.30.2 h1:EGJapJa7Sh2ePc/WyHziLVh9xtuh4vWPBoSGxVZ8uC8=
 kmodules.xyz/resource-metrics v0.30.2/go.mod h1:UYcQQLN+3o8rNPQJwJa2D9bt5ihJCeo5bCDuQ4O3MPY=
 kmodules.xyz/resource-metrics/utils v0.30.1 h1:iRnAKNMMdAi7QYjMQrK9W3vNMhSC21RWNx9yS3qlpTA=

diff --git a/...tadata/hub/resourceblockdefinitions/core.kubestash.com/v1alpha1/backupconfigurations.yaml b/...tadata/hub/resourceblockdefinitions/core.kubestash.com/v1alpha1/backupconfigurations.yaml
@@ -43,21 +43,17 @@ spec:
     ref:
       group: appcatalog.appscode.com
       kind: AppBinding
-    view:
-      name: appcatalog.appscode.com-v1alpha1-appbindings-kubedb
   - actions:
       create: Never
     displayMode: Field
     kind: Connection
-    name: Repository
+    name: BackupStorage
     query:
-      byLabel: offshoot
+      byLabel: storage
       type: GraphQL
     ref:
       group: storage.kubestash.com
-      kind: Repository
-    view:
-      name: storage.kubestash.com-v1alpha1-repositories
+      kind: BackupStorage
   - actions:
       create: Never
     displayMode: List

diff --git a/...ce-metadata/hub/resourcedescriptors/core.kubestash.com/v1alpha1/backupconfigurations.yaml b/...ce-metadata/hub/resourcedescriptors/core.kubestash.com/v1alpha1/backupconfigurations.yaml
@@ -12,10 +12,8 @@ spec:
   connections:
   - labels:
     - storage
-    namespace:
-      path: metadata.namespace
     references:
-    - '{range .spec.backends[*]}{.storageRef.name},{.storageRef.name}{"\n"}{end}'
+    - '{range .spec.backends[*]}{.storageRef.name},{.storageRef.namespace}{"\n"}{end}'
     target:
       apiVersion: storage.kubestash.com/v1alpha1
       kind: BackupStorage
@@ -33,72 +31,72 @@ spec:
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
-      apiVersion: kubedb.com/v1alpha2
+      apiVersion: kubedb.com/v1
       kind: Postgres
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
-      apiVersion: kubedb.com/v1alpha2
+      apiVersion: kubedb.com/v1
       kind: Redis
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
-      apiVersion: kubedb.com/v1alpha2
+      apiVersion: kubedb.com/v1
       kind: Elasticsearch
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
-      apiVersion: kubedb.com/v1alpha2
-      kind: Kafka
+      apiVersion: kubedb.com/v1
+      kind: MariaDB
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
-      apiVersion: kubedb.com/v1alpha2
-      kind: MariaDB
+      apiVersion: kubedb.com/v1
+      kind: MongoDB
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
-      apiVersion: kubedb.com/v1alpha2
-      kind: MongoDB
+      apiVersion: kubedb.com/v1
+      kind: MySQL
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
-      apiVersion: kubedb.com/v1alpha2
-      kind: MySQL
+      apiVersion: kubedb.com/v1
+      kind: PerconaXtraDB
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
       apiVersion: kubedb.com/v1alpha2
-      kind: PerconaXtraDB
+      kind: MSSQLServer
     type: MatchRef
   - labels:
     - backup_via
     references:
     - '{.spec.target.name},{.spec.target.namespace},{.spec.target.kind},{.spec.target.apiGroup}'
     target:
       apiVersion: kubedb.com/v1alpha2
-      kind: RedisSentinel
+      kind: Singlestore
     type: MatchRef
   resource:
     group: core.kubestash.com

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1985,7 +1985,7 @@ kmodules.xyz/monitoring-agent-api/client
 ## explicit; go 1.22.0
 kmodules.xyz/offshoot-api/api/v1
 kmodules.xyz/offshoot-api/api/v2
-# kmodules.xyz/resource-metadata v0.18.11
+# kmodules.xyz/resource-metadata v0.18.12-0.20240819141406-fd6ce5e1e955
 ## explicit; go 1.22.1
 kmodules.xyz/resource-metadata/apis/core/install
 kmodules.xyz/resource-metadata/apis/core/v1alpha1