hot-fix change var for postgres clusterkind

instaclustr · Sep 20, 2023 · 88ad6c2 · 88ad6c2
1 parent 80dba79
commit 88ad6c2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 2 deletions.
diff --git a/config/crd/bases/clusters.instaclustr.com_cassandras.yaml b/config/crd/bases/clusters.instaclustr.com_cassandras.yaml
@@ -143,9 +143,16 @@ spec:
                               type: string
                             vpcId:
                               type: string
+                          required:
+                          - network
+                          - vpcId
                           type: object
                         restoreMode:
                           type: string
+                      required:
+                      - cdcId
+                      - customVpcSettings
+                      - restoreMode
                       type: object
                     type: array
                   clusterID:

diff --git a/config/crd/bases/clusters.instaclustr.com_opensearches.yaml b/config/crd/bases/clusters.instaclustr.com_opensearches.yaml
@@ -184,9 +184,16 @@ spec:
                               type: string
                             vpcId:
                               type: string
+                          required:
+                          - network
+                          - vpcId
                           type: object
                         restoreMode:
                           type: string
+                      required:
+                      - cdcId
+                      - customVpcSettings
+                      - restoreMode
                       type: object
                     type: array
                   clusterId:

diff --git a/config/crd/bases/clusters.instaclustr.com_postgresqls.yaml b/config/crd/bases/clusters.instaclustr.com_postgresqls.yaml
@@ -153,9 +153,16 @@ spec:
                               type: string
                             vpcId:
                               type: string
+                          required:
+                          - network
+                          - vpcId
                           type: object
                         restoreMode:
                           type: string
+                      required:
+                      - cdcId
+                      - customVpcSettings
+                      - restoreMode
                       type: object
                     type: array
                   clusterId:

diff --git a/config/crd/bases/clusters.instaclustr.com_redis.yaml b/config/crd/bases/clusters.instaclustr.com_redis.yaml
@@ -150,9 +150,16 @@ spec:
                               type: string
                             vpcId:
                               type: string
+                          required:
+                          - network
+                          - vpcId
                           type: object
                         restoreMode:
                           type: string
+                      required:
+                      - cdcId
+                      - customVpcSettings
+                      - restoreMode
                       type: object
                     type: array
                   clusterId:

diff --git a/config/samples/clusterresources_v1beta1_clusterbackup.yaml b/config/samples/clusterresources_v1beta1_clusterbackup.yaml
@@ -4,4 +4,4 @@ metadata:
   name: clusterbackup-sample
 spec:
   clusterId: 2ae611cf-ac91-4325-941c-a35c043f9c34
-  clusterKind: PostgreSQl
+  clusterKind: PostgreSQL
diff --git a/controllers/clusterresources/clusterbackup_controller.go b/controllers/clusterresources/clusterbackup_controller.go
@@ -114,7 +114,7 @@ func (r *ClusterBackupReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	}
 
 	clusterKind := models.ClusterKindsMap[backup.Spec.ClusterKind]
-	if backup.Spec.ClusterKind == models.DefaultPgDbNameValue {
+	if backup.Spec.ClusterKind == models.PgClusterKind {
 		clusterKind = models.PgAppKind
 	}