From 0696d7b4dfe7436daeaa08e8e1c5eb3ab1cb6b4e Mon Sep 17 00:00:00 2001 From: adibrastegarnia Date: Mon, 27 Apr 2020 11:32:04 -0700 Subject: [PATCH] Update manifest --- deploy/raft-storage-controller.yaml | 12 ------------ pkg/controller/reconciler.go | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/deploy/raft-storage-controller.yaml b/deploy/raft-storage-controller.yaml index ac52a69..827fb69 100644 --- a/deploy/raft-storage-controller.yaml +++ b/deploy/raft-storage-controller.yaml @@ -39,7 +39,6 @@ spec: default: 1 volumeClaimTemplates: type: object - default: {} required: - data properties: @@ -47,14 +46,11 @@ spec: type: object default: {} required: - - metadata - spec properties: metadata: type: object default: {} - required: - - name properties: name: type: string @@ -62,10 +58,6 @@ spec: spec: type: object default: {} - required: - - accessModes - - storageClassName - - resources properties: accessModes: type: array @@ -79,14 +71,10 @@ spec: 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 index 0d0337d..5d0e739 100644 --- 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,