Merge pull request #47 from vshn/dbaas-bugs

Dbaas bugs
vshn · Nov 11, 2022 · 94223db · 94223db
2 parents 8c58910 + bb2386d
commit 94223db
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 40 deletions.
diff --git a/apis/v1/dbaas_exoscale_mysql.go b/apis/v1/dbaas_exoscale_mysql.go
@@ -11,11 +11,11 @@ import (
 //go:generate yq -i e ../generated/appcat.vshn.io_exoscalemysqls.yaml --expression "with(.spec.versions[]; .referenceable=true, del(.storage), del(.subresources))"
 
 // Patch the XRD with this generated CRD scheme
-//go:generate yq -i e ../../packages/composite/dbaas/exoscale/mysql.yml --expression ".parameters.appcat.composites.\"exoscalemysqls.appcat.vshn.io\".spec.versions=load(\"../generated/appcat.vshn.io_exoscalemysqls.yaml\").spec.versions"
+//go:generate yq -i e ../../packages/composite/dbaas/exoscale/mysql.yml --expression ".parameters.appcat.composites.\"xexoscalemysqls.appcat.vshn.io\".spec.versions=load(\"../generated/appcat.vshn.io_exoscalemysqls.yaml\").spec.versions"
 
 // +kubebuilder:object:root=true
-// +kubebuilder:printcolumn:name="Plan",type="string",JSONPath=".status.parameters.size.plan"
-// +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".spec.parameters.zone"
+// +kubebuilder:printcolumn:name="Plan",type="string",JSONPath=".spec.parameters.size.plan"
+// +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".spec.parameters.service.zone"
 
 // ExoscaleMySQL is the API for creating MySQL on Exoscale.
 type ExoscaleMySQL struct {

diff --git a/apis/v1/dbaas_exoscale_postgresql.go b/apis/v1/dbaas_exoscale_postgresql.go
@@ -11,11 +11,11 @@ import (
 //go:generate yq -i e ../generated/appcat.vshn.io_exoscalepostgresqls.yaml --expression "with(.spec.versions[]; .referenceable=true, del(.storage), del(.subresources))"
 
 // Patch the XRD with this generated CRD scheme
-//go:generate yq -i e ../../packages/composite/dbaas/exoscale/postgres.yml --expression ".parameters.appcat.composites.\"exoscalepostgresqls.appcat.vshn.io\".spec.versions=load(\"../generated/appcat.vshn.io_exoscalepostgresqls.yaml\").spec.versions"
+//go:generate yq -i e ../../packages/composite/dbaas/exoscale/postgres.yml --expression ".parameters.appcat.composites.\"xexoscalepostgresqls.appcat.vshn.io\".spec.versions=load(\"../generated/appcat.vshn.io_exoscalepostgresqls.yaml\").spec.versions"
 
 // +kubebuilder:object:root=true
-// +kubebuilder:printcolumn:name="Plan",type="string",JSONPath=".status.parameters.size.plan"
-// +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".spec.parameters.zone"
+// +kubebuilder:printcolumn:name="Plan",type="string",JSONPath=".spec.parameters.size.plan"
+// +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".spec.parameters.service.zone"
 
 // ExoscalePostgreSQL is the API for creating PostgreSQL on Exoscale.
 type ExoscalePostgreSQL struct {

diff --git a/apis/v1/dbaas_exoscale_redis.go b/apis/v1/dbaas_exoscale_redis.go
@@ -11,11 +11,11 @@ import (
 //go:generate yq -i e ../generated/appcat.vshn.io_exoscaleredis.yaml --expression "with(.spec.versions[]; .referenceable=true, del(.storage), del(.subresources))"
 
 // Patch the XRD with this generated CRD scheme
-//go:generate yq -i e ../../packages/composite/dbaas/exoscale/redis.yml --expression ".parameters.appcat.composites.\"exoscaleredis.appcat.vshn.io\".spec.versions=load(\"../generated/appcat.vshn.io_exoscaleredis.yaml\").spec.versions"
+//go:generate yq -i e ../../packages/composite/dbaas/exoscale/redis.yml --expression ".parameters.appcat.composites.\"xexoscaleredis.appcat.vshn.io\".spec.versions=load(\"../generated/appcat.vshn.io_exoscaleredis.yaml\").spec.versions"
 
 // +kubebuilder:object:root=true
-// +kubebuilder:printcolumn:name="Plan",type="string",JSONPath=".status.parameters.size.plan"
-// +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".spec.parameters.zone"
+// +kubebuilder:printcolumn:name="Plan",type="string",JSONPath=".spec.parameters.size.plan"
+// +kubebuilder:printcolumn:name="Zone",type="string",JSONPath=".spec.parameters.service.zone"
 
 // ExoscaleRedis is the API for creating Redis instances on Exoscale.
 type ExoscaleRedis struct {

diff --git a/packages/composite/dbaas/exoscale/mysql.yml b/packages/composite/dbaas/exoscale/mysql.yml
@@ -3,7 +3,7 @@ classes:
 parameters:
   appcat:
     composites:
-      "exoscalemysqls.appcat.vshn.io":
+      "xexoscalemysqls.appcat.vshn.io":
         spec:
           group: appcat.vshn.io
           names:
@@ -24,10 +24,10 @@ parameters:
             name: exoscale.mysql.appcat.vshn.io
           versions:
             - additionalPrinterColumns:
-                - jsonPath: .status.parameters.size.plan
+                - jsonPath: .spec.parameters.size.plan
                   name: Plan
                   type: string
-                - jsonPath: .spec.parameters.zone
+                - jsonPath: .spec.parameters.service.zone
                   name: Zone
                   type: string
               name: v1

diff --git a/packages/composite/dbaas/exoscale/postgres.yml b/packages/composite/dbaas/exoscale/postgres.yml
@@ -3,7 +3,7 @@ classes:
 parameters:
   appcat:
     composites:
-      "exoscalepostgresqls.appcat.vshn.io":
+      "xexoscalepostgresqls.appcat.vshn.io":
         spec:
           group: appcat.vshn.io
           names:
@@ -24,10 +24,10 @@ parameters:
             name: exoscale.postgres.appcat.vshn.io
           versions:
             - additionalPrinterColumns:
-                - jsonPath: .status.parameters.size.plan
+                - jsonPath: .spec.parameters.size.plan
                   name: Plan
                   type: string
-                - jsonPath: .spec.parameters.zone
+                - jsonPath: .spec.parameters.service.zone
                   name: Zone
                   type: string
               name: v1

diff --git a/packages/composite/dbaas/exoscale/redis.yml b/packages/composite/dbaas/exoscale/redis.yml
@@ -3,7 +3,7 @@ classes:
 parameters:
   appcat:
     composites:
-      "exoscaleredis.appcat.vshn.io":
+      "xexoscaleredis.appcat.vshn.io":
         spec:
           group: appcat.vshn.io
           names:
@@ -23,10 +23,10 @@ parameters:
             name: exoscale.redis.appcat.vshn.io
           versions:
             - additionalPrinterColumns:
-                - jsonPath: .status.parameters.size.plan
+                - jsonPath: .spec.parameters.size.plan
                   name: Plan
                   type: string
-                - jsonPath: .spec.parameters.zone
+                - jsonPath: .spec.parameters.service.zone
                   name: Zone
                   type: string
               name: v1

diff --git a/packages/composition/dbaas/exoscale/mysql.yml b/packages/composition/dbaas/exoscale/mysql.yml
@@ -17,7 +17,7 @@ parameters:
         spec:
           compositeTypeRef:
             apiVersion: appcat.vshn.io/v1
-            kind: XMySQL
+            kind: XExoscaleMySQL
           writeConnectionSecretsToNamespace: ${crossplane:namespace}
           resources:
 

diff --git a/packages/composition/dbaas/exoscale/postgres.yml b/packages/composition/dbaas/exoscale/postgres.yml
@@ -17,7 +17,7 @@ parameters:
         spec:
           compositeTypeRef:
             apiVersion: appcat.vshn.io/v1
-            kind: XPostgreSQL
+            kind: XExoscalePostgreSQL
           writeConnectionSecretsToNamespace: ${crossplane:namespace}
           resources:
 

diff --git a/packages/tests/golden/composite-dbaas-mysql-exoscale/appcat/appcat/clusterRoles.yaml b/packages/tests/golden/composite-dbaas-mysql-exoscale/appcat/appcat/clusterRoles.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: {}
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: 'true'
-  name: appcat:composite:exoscalemysqls.appcat.vshn.io:claim-view
+  name: appcat:composite:xexoscalemysqls.appcat.vshn.io:claim-view
 rules:
   - apiGroups:
       - appcat.vshn.io
@@ -24,7 +24,7 @@ metadata:
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: 'true'
     rbac.authorization.k8s.io/aggregate-to-edit: 'true'
-  name: appcat:composite:exoscalemysqls.appcat.vshn.io:claim-edit
+  name: appcat:composite:xexoscalemysqls.appcat.vshn.io:claim-edit
 rules:
   - apiGroups:
       - appcat.vshn.io

diff --git a/packages/tests/golden/composite-dbaas-mysql-exoscale/appcat/appcat/composites.yaml b/packages/tests/golden/composite-dbaas-mysql-exoscale/appcat/appcat/composites.yaml
@@ -5,8 +5,8 @@ metadata:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '10'
   labels:
-    name: exoscalemysqls.appcat.vshn.io
-  name: exoscalemysqls.appcat.vshn.io
+    name: xexoscalemysqls.appcat.vshn.io
+  name: xexoscalemysqls.appcat.vshn.io
 spec:
   claimNames:
     kind: ExoscaleMySQL
@@ -27,10 +27,10 @@ spec:
     plural: xexoscalemysqls
   versions:
     - additionalPrinterColumns:
-        - jsonPath: .status.parameters.size.plan
+        - jsonPath: .spec.parameters.size.plan
           name: Plan
           type: string
-        - jsonPath: .spec.parameters.zone
+        - jsonPath: .spec.parameters.service.zone
           name: Zone
           type: string
       name: v1

diff --git a/packages/tests/golden/composite-dbaas-postgres-exoscale/appcat/appcat/clusterRoles.yaml b/packages/tests/golden/composite-dbaas-postgres-exoscale/appcat/appcat/clusterRoles.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: {}
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: 'true'
-  name: appcat:composite:exoscalepostgresqls.appcat.vshn.io:claim-view
+  name: appcat:composite:xexoscalepostgresqls.appcat.vshn.io:claim-view
 rules:
   - apiGroups:
       - appcat.vshn.io
@@ -24,7 +24,7 @@ metadata:
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: 'true'
     rbac.authorization.k8s.io/aggregate-to-edit: 'true'
-  name: appcat:composite:exoscalepostgresqls.appcat.vshn.io:claim-edit
+  name: appcat:composite:xexoscalepostgresqls.appcat.vshn.io:claim-edit
 rules:
   - apiGroups:
       - appcat.vshn.io

diff --git a/packages/tests/golden/composite-dbaas-postgres-exoscale/appcat/appcat/composites.yaml b/packages/tests/golden/composite-dbaas-postgres-exoscale/appcat/appcat/composites.yaml
@@ -5,8 +5,8 @@ metadata:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '10'
   labels:
-    name: exoscalepostgresqls.appcat.vshn.io
-  name: exoscalepostgresqls.appcat.vshn.io
+    name: xexoscalepostgresqls.appcat.vshn.io
+  name: xexoscalepostgresqls.appcat.vshn.io
 spec:
   claimNames:
     kind: ExoscalePostgreSQL
@@ -27,10 +27,10 @@ spec:
     plural: xexoscalepostgresqls
   versions:
     - additionalPrinterColumns:
-        - jsonPath: .status.parameters.size.plan
+        - jsonPath: .spec.parameters.size.plan
           name: Plan
           type: string
-        - jsonPath: .spec.parameters.zone
+        - jsonPath: .spec.parameters.service.zone
           name: Zone
           type: string
       name: v1

diff --git a/packages/tests/golden/composite-dbaas-redis-exoscale/appcat/appcat/clusterRoles.yaml b/packages/tests/golden/composite-dbaas-redis-exoscale/appcat/appcat/clusterRoles.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: {}
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: 'true'
-  name: appcat:composite:exoscaleredis.appcat.vshn.io:claim-view
+  name: appcat:composite:xexoscaleredis.appcat.vshn.io:claim-view
 rules:
   - apiGroups:
       - appcat.vshn.io
@@ -24,7 +24,7 @@ metadata:
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: 'true'
     rbac.authorization.k8s.io/aggregate-to-edit: 'true'
-  name: appcat:composite:exoscaleredis.appcat.vshn.io:claim-edit
+  name: appcat:composite:xexoscaleredis.appcat.vshn.io:claim-edit
 rules:
   - apiGroups:
       - appcat.vshn.io

diff --git a/packages/tests/golden/composite-dbaas-redis-exoscale/appcat/appcat/composites.yaml b/packages/tests/golden/composite-dbaas-redis-exoscale/appcat/appcat/composites.yaml
@@ -5,8 +5,8 @@ metadata:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '10'
   labels:
-    name: exoscaleredis.appcat.vshn.io
-  name: exoscaleredis.appcat.vshn.io
+    name: xexoscaleredis.appcat.vshn.io
+  name: xexoscaleredis.appcat.vshn.io
 spec:
   claimNames:
     kind: ExoscaleRedis
@@ -26,10 +26,10 @@ spec:
     plural: xexoscaleredis
   versions:
     - additionalPrinterColumns:
-        - jsonPath: .status.parameters.size.plan
+        - jsonPath: .spec.parameters.size.plan
           name: Plan
           type: string
-        - jsonPath: .spec.parameters.zone
+        - jsonPath: .spec.parameters.service.zone
           name: Zone
           type: string
       name: v1

diff --git a/packages/tests/golden/composition-dbaas-mysql-exoscale/appcat/appcat/compositions.yaml b/packages/tests/golden/composition-dbaas-mysql-exoscale/appcat/appcat/compositions.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   compositeTypeRef:
     apiVersion: appcat.vshn.io/v1
-    kind: XMySQL
+    kind: XExoscaleMySQL
   patchSets:
     - name: annotations
       patches:

diff --git a/packages/tests/golden/composition-dbaas-postgres-exoscale/appcat/appcat/compositions.yaml b/packages/tests/golden/composition-dbaas-postgres-exoscale/appcat/appcat/compositions.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   compositeTypeRef:
     apiVersion: appcat.vshn.io/v1
-    kind: XPostgreSQL
+    kind: XExoscalePostgreSQL
   patchSets:
     - name: annotations
       patches: