Update manifest

atomix · Apr 27, 2020 · f6203b2 · f6203b2
1 parent 7c97b02
commit f6203b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/deploy/raft-storage-controller.yaml b/deploy/raft-storage-controller.yaml
@@ -29,47 +29,35 @@ spec:
                   type: string
                 replicas:
                   type: integer
-                  min: 1
-                  max: 9
+                  minimum: 1
+                  maximum: 9
                   default: 1
                 partitionsPerCluster:
                   type: integer
-                  min: 1
-                  max: 1024
+                  minimum: 1
+                  maximum: 1024
                   default: 1
                 volumeClaimTemplates:
                   type: object
-                  default: {}
                   required:
                     - data
                   properties:
                     data:
                       type: object
-                      default: {}
                       required:
-                        - metadata
                         - spec
                       properties:
                         metadata:
                           type: object
-                          default: {}
-                          required:
-                            - name
                           properties:
                             name:
                               type: string
                               default: ''
                         spec:
                           type: object
-                          default: {}
-                          required:
-                            - accessModes
-                            - storageClassName
-                            - resources
                           properties:
                             accessModes:
                               type: array
-                              default: []
                               items:
                                 type: string
                                 default: ''
@@ -78,15 +66,9 @@ spec:
                               default: ''
                             resources:
                               type: object
-                              default: {}
-                              required:
-                                - requests
                               properties:
                                 requests:
                                   type: object
-                                  default: {}
-                                  required:
-                                    - storage
                                   properties:
                                     storage:
                                       type: string

diff --git a/pkg/controller/reconciler.go b/pkg/controller/reconciler.go
@@ -315,7 +315,7 @@ func (r *Reconciler) addStatefulSet(database *v1beta3.Database, storage *v1beta1
 	}
 
 	volumeMounts = append(volumeMounts, configVolumeMount)
-	if storage.Spec.VolumeClaimTemplates.Data.Name == "" {
+	if storage.Spec.VolumeClaimTemplates.Data == nil {
 		dataVolumeMount := corev1.VolumeMount{
 			Name:      dataVolume,
 			MountPath: dataPath,