diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go index 66c3f5981..bb15d4bb7 100644 --- a/api/v1beta1/common_types.go +++ b/api/v1beta1/common_types.go @@ -45,7 +45,7 @@ type ExistingPasswordSecret struct { // Storage is the inteface to add pvc and pv support in redis type Storage struct { - CommonAttributes common.Storage `json:",inline"` + common.Storage `json:",inline"` } // RedisExporter interface will have the information for redis exporter related stuff diff --git a/api/v1beta1/redis_conversion.go b/api/v1beta1/redis_conversion.go index dd3722040..297eb7e3f 100644 --- a/api/v1beta1/redis_conversion.go +++ b/api/v1beta1/redis_conversion.go @@ -9,6 +9,9 @@ import ( func (src *Redis) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*redisv1beta2.Redis) + // if src == nil { + // return errors.New("source is nil") + // } // ObjectMeta dst.ObjectMeta = src.ObjectMeta @@ -16,15 +19,19 @@ func (src *Redis) ConvertTo(dstRaw conversion.Hub) error { dst.Spec.KubernetesConfig.KubernetesConfig = src.Spec.KubernetesConfig.KubernetesConfig // RedisExporter if src.Spec.RedisExporter != nil { + dst.Spec.RedisExporter = &redisv1beta2.RedisExporter{} dst.Spec.RedisExporter.RedisExporter = src.Spec.RedisExporter.RedisExporter } // RedisConfig if src.Spec.RedisConfig != nil { + dst.Spec.RedisConfig = &redisv1beta2.RedisConfig{} dst.Spec.RedisConfig.RedisConfig = src.Spec.RedisConfig.RedisConfig } // Storage if src.Spec.Storage != nil { - dst.Spec.Storage.CommonAttributes = src.Spec.Storage.CommonAttributes + dst.Spec.Storage = &redisv1beta2.Storage{} + dst.Spec.Storage.VolumeClaimTemplate = src.Spec.Storage.VolumeClaimTemplate + dst.Spec.Storage.VolumeMount = src.Spec.Storage.VolumeMount } // NodeSelector if src.Spec.NodeSelector != nil { @@ -48,14 +55,17 @@ func (src *Redis) ConvertTo(dstRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &redisv1beta2.TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // ReadinessProbe if src.Spec.ReadinessProbe != nil { + dst.Spec.ReadinessProbe = &redisv1beta2.Probe{} dst.Spec.ReadinessProbe.Probe = src.Spec.ReadinessProbe.Probe } // LivenessProbe if src.Spec.LivenessProbe != nil { + dst.Spec.LivenessProbe = &redisv1beta2.Probe{} dst.Spec.LivenessProbe.Probe = src.Spec.LivenessProbe.Probe } // Sidecars @@ -80,6 +90,9 @@ func (src *Redis) ConvertTo(dstRaw conversion.Hub) error { func (dst *Redis) ConvertFrom(srcRaw conversion.Hub) error { src := srcRaw.(*redisv1beta2.Redis) + // if src == nil { + // return errors.New("source is nil") + // } // ObjectMeta dst.ObjectMeta = src.ObjectMeta @@ -87,15 +100,19 @@ func (dst *Redis) ConvertFrom(srcRaw conversion.Hub) error { dst.Spec.KubernetesConfig.KubernetesConfig = src.Spec.KubernetesConfig.KubernetesConfig // RedisExporter if src.Spec.RedisExporter != nil { + dst.Spec.RedisExporter = &RedisExporter{} dst.Spec.RedisExporter.RedisExporter = src.Spec.RedisExporter.RedisExporter } // RedisConfig if src.Spec.RedisConfig != nil { + dst.Spec.RedisConfig = &RedisConfig{} dst.Spec.RedisConfig.RedisConfig = src.Spec.RedisConfig.RedisConfig } // Storage if src.Spec.Storage != nil { - dst.Spec.Storage.CommonAttributes = src.Spec.Storage.CommonAttributes + dst.Spec.Storage = &Storage{} + dst.Spec.Storage.VolumeClaimTemplate = src.Spec.Storage.VolumeClaimTemplate + dst.Spec.Storage.VolumeMount = src.Spec.Storage.VolumeMount } // NodeSelector if src.Spec.NodeSelector != nil { @@ -119,14 +136,17 @@ func (dst *Redis) ConvertFrom(srcRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // ReadinessProbe if src.Spec.ReadinessProbe != nil { + dst.Spec.ReadinessProbe = &Probe{} dst.Spec.ReadinessProbe.Probe = src.Spec.ReadinessProbe.Probe } // LivenessProbe if src.Spec.LivenessProbe != nil { + dst.Spec.LivenessProbe = &Probe{} dst.Spec.LivenessProbe.Probe = src.Spec.LivenessProbe.Probe } // Sidecars @@ -139,7 +159,6 @@ func (dst *Redis) ConvertFrom(srcRaw conversion.Hub) error { } dst.Spec.Sidecars = &sidecars } - // ServiceAccountName if src.Spec.ServiceAccountName != nil { dst.Spec.ServiceAccountName = src.Spec.ServiceAccountName diff --git a/api/v1beta1/rediscluster_conversion.go b/api/v1beta1/rediscluster_conversion.go index 3eeeb8984..c5e715b4a 100644 --- a/api/v1beta1/rediscluster_conversion.go +++ b/api/v1beta1/rediscluster_conversion.go @@ -5,7 +5,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/conversion" ) -// ConvertTo converts this RedisCluster to the Hub version (v1beta2). +// ConvertTo converts this RedisCluster to the Hub version (v1beta2) from the current version (v1beta1) + func (src *RedisCluster) ConvertTo(dstRaw conversion.Hub) error { dst := dstRaw.(*redisv1beta2.RedisCluster) @@ -28,12 +29,15 @@ func (src *RedisCluster) ConvertTo(dstRaw conversion.Hub) error { dst.Spec.RedisFollower.CommonAttributes = src.Spec.RedisFollower.CommonAttributes // RedisExporter if src.Spec.RedisExporter != nil { + dst.Spec.RedisExporter = &redisv1beta2.RedisExporter{} dst.Spec.RedisExporter.RedisExporter = src.Spec.RedisExporter.RedisExporter } - // Storage + // Storage-v1bet1 >> ClusterStorage-v1beta2 if src.Spec.Storage != nil { // Note : Add the Check the creation of node-conf later - dst.Spec.Storage.CommonAttributes = src.Spec.Storage.CommonAttributes + dst.Spec.Storage = &redisv1beta2.ClusterStorage{} + dst.Spec.Storage.VolumeClaimTemplate = src.Spec.Storage.VolumeClaimTemplate + dst.Spec.Storage.VolumeMount = src.Spec.Storage.VolumeMount } // SecurityContext >> PodSecurityContext if src.Spec.SecurityContext != nil { @@ -49,6 +53,7 @@ func (src *RedisCluster) ConvertTo(dstRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &redisv1beta2.TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // Sidecars @@ -61,7 +66,6 @@ func (src *RedisCluster) ConvertTo(dstRaw conversion.Hub) error { } dst.Spec.Sidecars = &sidecars } - // ServiceAccountName if src.Spec.ServiceAccountName != nil { dst.Spec.ServiceAccountName = src.Spec.ServiceAccountName @@ -70,7 +74,6 @@ func (src *RedisCluster) ConvertTo(dstRaw conversion.Hub) error { if src.Spec.PersistenceEnabled != nil { dst.Spec.PersistenceEnabled = src.Spec.PersistenceEnabled } - return nil } @@ -97,11 +100,14 @@ func (dst *RedisCluster) ConvertFrom(srcRaw conversion.Hub) error { dst.Spec.RedisFollower.CommonAttributes = src.Spec.RedisFollower.CommonAttributes // RedisExporter if src.Spec.RedisExporter != nil { + dst.Spec.RedisExporter = &RedisExporter{} dst.Spec.RedisExporter.RedisExporter = src.Spec.RedisExporter.RedisExporter } - // Storage + // ClusterStorage(v1beta2) >> Storage(v1beta1) if src.Spec.Storage != nil { - dst.Spec.Storage.CommonAttributes = src.Spec.Storage.CommonAttributes + dst.Spec.Storage = &Storage{} + dst.Spec.Storage.VolumeClaimTemplate = src.Spec.Storage.VolumeClaimTemplate + dst.Spec.Storage.VolumeMount = src.Spec.Storage.VolumeMount } // PodSecurityContext >> SecurityContext if src.Spec.PodSecurityContext != nil { @@ -117,6 +123,7 @@ func (dst *RedisCluster) ConvertFrom(srcRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // Sidecars @@ -129,7 +136,6 @@ func (dst *RedisCluster) ConvertFrom(srcRaw conversion.Hub) error { } dst.Spec.Sidecars = &sidecars } - // ServiceAccountName if src.Spec.ServiceAccountName != nil { dst.Spec.ServiceAccountName = src.Spec.ServiceAccountName diff --git a/api/v1beta1/redisreplication_conversion.go b/api/v1beta1/redisreplication_conversion.go index 9c3f1a0fb..5555dfc5a 100644 --- a/api/v1beta1/redisreplication_conversion.go +++ b/api/v1beta1/redisreplication_conversion.go @@ -18,15 +18,19 @@ func (src *RedisReplication) ConvertTo(dstRaw conversion.Hub) error { dst.Spec.KubernetesConfig.KubernetesConfig = src.Spec.KubernetesConfig.KubernetesConfig // RedisExporter if src.Spec.RedisExporter != nil { + dst.Spec.RedisExporter = &redisv1beta2.RedisExporter{} dst.Spec.RedisExporter.RedisExporter = src.Spec.RedisExporter.RedisExporter } // RedisConfig if src.Spec.RedisConfig != nil { + dst.Spec.RedisConfig = &redisv1beta2.RedisConfig{} dst.Spec.RedisConfig.RedisConfig = src.Spec.RedisConfig.RedisConfig } // Storage if src.Spec.Storage != nil { - dst.Spec.Storage.CommonAttributes = src.Spec.Storage.CommonAttributes + dst.Spec.Storage = &redisv1beta2.Storage{} + dst.Spec.Storage.VolumeClaimTemplate = src.Spec.Storage.VolumeClaimTemplate + dst.Spec.Storage.VolumeMount = src.Spec.Storage.VolumeMount } // NodeSelector if src.Spec.NodeSelector != nil { @@ -50,18 +54,20 @@ func (src *RedisReplication) ConvertTo(dstRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &redisv1beta2.TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // ReadinessProbe if src.Spec.ReadinessProbe != nil { + dst.Spec.ReadinessProbe = &redisv1beta2.Probe{} dst.Spec.ReadinessProbe.Probe = src.Spec.ReadinessProbe.Probe } // LivenessProbe if src.Spec.LivenessProbe != nil { + dst.Spec.LivenessProbe = &redisv1beta2.Probe{} dst.Spec.LivenessProbe.Probe = src.Spec.LivenessProbe.Probe } // Sidecars - // Sidecars if src.Spec.Sidecars != nil { var sidecars []redisv1beta2.Sidecar for _, sidecar := range *src.Spec.Sidecars { @@ -75,7 +81,6 @@ func (src *RedisReplication) ConvertTo(dstRaw conversion.Hub) error { if src.Spec.ServiceAccountName != nil { dst.Spec.ServiceAccountName = src.Spec.ServiceAccountName } - return nil } @@ -92,15 +97,19 @@ func (dst *RedisReplication) ConvertFrom(srcRaw conversion.Hub) error { dst.Spec.KubernetesConfig.KubernetesConfig = src.Spec.KubernetesConfig.KubernetesConfig // RedisExporter if src.Spec.RedisExporter != nil { + dst.Spec.RedisExporter = &RedisExporter{} dst.Spec.RedisExporter.RedisExporter = src.Spec.RedisExporter.RedisExporter } // RedisConfig if src.Spec.RedisConfig != nil { + dst.Spec.RedisConfig = &RedisConfig{} dst.Spec.RedisConfig.RedisConfig = src.Spec.RedisConfig.RedisConfig } // Storage if src.Spec.Storage != nil { - dst.Spec.Storage.CommonAttributes = src.Spec.Storage.CommonAttributes + dst.Spec.Storage = &Storage{} + dst.Spec.Storage.VolumeClaimTemplate = src.Spec.Storage.VolumeClaimTemplate + dst.Spec.Storage.VolumeMount = src.Spec.Storage.VolumeMount } // NodeSelector if src.Spec.NodeSelector != nil { @@ -124,14 +133,17 @@ func (dst *RedisReplication) ConvertFrom(srcRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // ReadinessProbe if src.Spec.ReadinessProbe != nil { + dst.Spec.ReadinessProbe = &Probe{} dst.Spec.ReadinessProbe.Probe = src.Spec.ReadinessProbe.Probe } // LivenessProbe if src.Spec.LivenessProbe != nil { + dst.Spec.ReadinessProbe = &Probe{} dst.Spec.LivenessProbe.Probe = src.Spec.LivenessProbe.Probe } // Sidecars @@ -144,7 +156,6 @@ func (dst *RedisReplication) ConvertFrom(srcRaw conversion.Hub) error { } dst.Spec.Sidecars = &sidecars } - // ServiceAccountName if src.Spec.ServiceAccountName != nil { dst.Spec.ServiceAccountName = src.Spec.ServiceAccountName diff --git a/api/v1beta1/redissentinel_conversion.go b/api/v1beta1/redissentinel_conversion.go index b0926ff7f..479f76cad 100644 --- a/api/v1beta1/redissentinel_conversion.go +++ b/api/v1beta1/redissentinel_conversion.go @@ -18,6 +18,7 @@ func (src *RedisSentinel) ConvertTo(dstRaw conversion.Hub) error { dst.Spec.KubernetesConfig.KubernetesConfig = src.Spec.KubernetesConfig.KubernetesConfig // RedisSentinelConfig if src.Spec.RedisSentinelConfig != nil { + dst.Spec.RedisSentinelConfig = &redisv1beta2.RedisSentinelConfig{} dst.Spec.RedisSentinelConfig.RedisSentinelConfig = src.Spec.RedisSentinelConfig.RedisSentinelConfig } // NodeSelector @@ -42,18 +43,20 @@ func (src *RedisSentinel) ConvertTo(dstRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &redisv1beta2.TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // ReadinessProbe if src.Spec.ReadinessProbe != nil { + dst.Spec.ReadinessProbe = &redisv1beta2.Probe{} dst.Spec.ReadinessProbe.Probe = src.Spec.ReadinessProbe.Probe } // LivenessProbe if src.Spec.LivenessProbe != nil { + dst.Spec.ReadinessProbe = &redisv1beta2.Probe{} dst.Spec.LivenessProbe.Probe = src.Spec.LivenessProbe.Probe } // Sidecars - // Sidecars if src.Spec.Sidecars != nil { var sidecars []redisv1beta2.Sidecar for _, sidecar := range *src.Spec.Sidecars { @@ -63,12 +66,10 @@ func (src *RedisSentinel) ConvertTo(dstRaw conversion.Hub) error { } dst.Spec.Sidecars = &sidecars } - // ServiceAccountName if src.Spec.ServiceAccountName != nil { dst.Spec.ServiceAccountName = src.Spec.ServiceAccountName } - return nil } @@ -85,6 +86,7 @@ func (dst *RedisSentinel) ConvertFrom(srcRaw conversion.Hub) error { dst.Spec.KubernetesConfig.KubernetesConfig = src.Spec.KubernetesConfig.KubernetesConfig // RedisSentinelConfig if src.Spec.RedisSentinelConfig != nil { + dst.Spec.RedisSentinelConfig = &RedisSentinelConfig{} dst.Spec.RedisSentinelConfig.RedisSentinelConfig = src.Spec.RedisSentinelConfig.RedisSentinelConfig } // NodeSelector @@ -109,14 +111,17 @@ func (dst *RedisSentinel) ConvertFrom(srcRaw conversion.Hub) error { } // TLS if src.Spec.TLS != nil { + dst.Spec.TLS = &TLSConfig{} dst.Spec.TLS.TLSConfig = src.Spec.TLS.TLSConfig } // ReadinessProbe if src.Spec.ReadinessProbe != nil { + dst.Spec.ReadinessProbe = &Probe{} dst.Spec.ReadinessProbe.Probe = src.Spec.ReadinessProbe.Probe } // LivenessProbe if src.Spec.LivenessProbe != nil { + dst.Spec.ReadinessProbe = &Probe{} dst.Spec.LivenessProbe.Probe = src.Spec.LivenessProbe.Probe } // Sidecars @@ -129,7 +134,6 @@ func (dst *RedisSentinel) ConvertFrom(srcRaw conversion.Hub) error { } dst.Spec.Sidecars = &sidecars } - // ServiceAccountName if src.Spec.ServiceAccountName != nil { dst.Spec.ServiceAccountName = src.Spec.ServiceAccountName diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index 319233b6c..60c4a668c 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -850,7 +850,7 @@ func (in *Sidecar) DeepCopy() *Sidecar { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Storage) DeepCopyInto(out *Storage) { *out = *in - in.CommonAttributes.DeepCopyInto(&out.CommonAttributes) + in.Storage.DeepCopyInto(&out.Storage) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Storage. diff --git a/api/v1beta2/common_types.go b/api/v1beta2/common_types.go index bd65fdb2e..76a3adcd0 100644 --- a/api/v1beta2/common_types.go +++ b/api/v1beta2/common_types.go @@ -46,7 +46,7 @@ type ExistingPasswordSecret struct { // Storage is the inteface to add pvc and pv support in redis type Storage struct { - CommonAttributes common.Storage `json:",inline"` + common.Storage `json:",inline"` } // Node-conf needs to be added only in redis cluster @@ -54,7 +54,7 @@ type ClusterStorage struct { // +kubebuilder:default=false NodeConfVolume bool `json:"nodeConfVolume,omitempty"` NodeConfVolumeClaimTemplate corev1.PersistentVolumeClaim `json:"nodeConfVolumeClaimTemplate,omitempty"` - CommonAttributes common.Storage `json:",inline"` + common.Storage `json:",inline"` } // RedisExporter interface will have the information for redis exporter related stuff diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go index 26abd705b..df9897888 100644 --- a/api/v1beta2/zz_generated.deepcopy.go +++ b/api/v1beta2/zz_generated.deepcopy.go @@ -51,7 +51,7 @@ func (in *ACLConfig) DeepCopy() *ACLConfig { func (in *ClusterStorage) DeepCopyInto(out *ClusterStorage) { *out = *in in.NodeConfVolumeClaimTemplate.DeepCopyInto(&out.NodeConfVolumeClaimTemplate) - in.CommonAttributes.DeepCopyInto(&out.CommonAttributes) + in.Storage.DeepCopyInto(&out.Storage) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterStorage. @@ -1048,7 +1048,7 @@ func (in *Sidecar) DeepCopy() *Sidecar { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Storage) DeepCopyInto(out *Storage) { *out = *in - in.CommonAttributes.DeepCopyInto(&out.CommonAttributes) + in.Storage.DeepCopyInto(&out.Storage) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Storage. diff --git a/k8sutils/redis-cluster.go b/k8sutils/redis-cluster.go index cccbe4e50..9f9619283 100644 --- a/k8sutils/redis-cluster.go +++ b/k8sutils/redis-cluster.go @@ -52,7 +52,7 @@ func generateRedisClusterParams(cr *redisv1beta2.RedisCluster, replicas int32, e res.ImagePullSecrets = cr.Spec.KubernetesConfig.ImagePullSecrets } if cr.Spec.Storage != nil { - res.PersistentVolumeClaim = cr.Spec.Storage.CommonAttributes.VolumeClaimTemplate + res.PersistentVolumeClaim = cr.Spec.Storage.VolumeClaimTemplate res.NodeConfPersistentVolumeClaim = cr.Spec.Storage.NodeConfVolumeClaimTemplate } if externalConfig != nil { @@ -83,8 +83,8 @@ func generateRedisClusterInitContainerParams(cr *redisv1beta2.RedisCluster) init } if cr.Spec.Storage != nil { - initcontainerProp.AdditionalVolume = cr.Spec.Storage.CommonAttributes.VolumeMount.Volume - initcontainerProp.AdditionalMountPath = cr.Spec.Storage.CommonAttributes.VolumeMount.MountPath + initcontainerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume + initcontainerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath } if cr.Spec.Storage != nil { initcontainerProp.PersistenceEnabled = &trueProperty @@ -107,8 +107,8 @@ func generateRedisClusterContainerParams(cr *redisv1beta2.RedisCluster, security SecurityContext: securityContext, } if cr.Spec.Storage != nil { - containerProp.AdditionalVolume = cr.Spec.Storage.CommonAttributes.VolumeMount.Volume - containerProp.AdditionalMountPath = cr.Spec.Storage.CommonAttributes.VolumeMount.MountPath + containerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume + containerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath } if cr.Spec.KubernetesConfig.ExistingPasswordSecret != nil { containerProp.EnabledPassword = &trueProperty diff --git a/k8sutils/redis-replication.go b/k8sutils/redis-replication.go index 756a03464..4d8c4234f 100644 --- a/k8sutils/redis-replication.go +++ b/k8sutils/redis-replication.go @@ -81,7 +81,7 @@ func generateRedisReplicationParams(cr *redisv1beta2.RedisReplication) statefulS res.ImagePullSecrets = cr.Spec.KubernetesConfig.ImagePullSecrets } if cr.Spec.Storage != nil { - res.PersistentVolumeClaim = cr.Spec.Storage.CommonAttributes.VolumeClaimTemplate + res.PersistentVolumeClaim = cr.Spec.Storage.VolumeClaimTemplate } if cr.Spec.RedisConfig != nil { res.ExternalConfig = cr.Spec.RedisConfig.AdditionalRedisConfig @@ -111,8 +111,8 @@ func generateRedisReplicationContainerParams(cr *redisv1beta2.RedisReplication) } if cr.Spec.Storage != nil { - containerProp.AdditionalVolume = cr.Spec.Storage.CommonAttributes.VolumeMount.Volume - containerProp.AdditionalMountPath = cr.Spec.Storage.CommonAttributes.VolumeMount.MountPath + containerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume + containerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath } if cr.Spec.KubernetesConfig.ExistingPasswordSecret != nil { @@ -173,8 +173,8 @@ func generateRedisReplicationInitContainerParams(cr *redisv1beta2.RedisReplicati } if cr.Spec.Storage != nil { - initcontainerProp.AdditionalVolume = cr.Spec.Storage.CommonAttributes.VolumeMount.Volume - initcontainerProp.AdditionalMountPath = cr.Spec.Storage.CommonAttributes.VolumeMount.MountPath + initcontainerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume + initcontainerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath } if cr.Spec.Storage != nil { initcontainerProp.PersistenceEnabled = &trueProperty diff --git a/k8sutils/redis-standalone.go b/k8sutils/redis-standalone.go index 80c96e536..71e3ea56e 100644 --- a/k8sutils/redis-standalone.go +++ b/k8sutils/redis-standalone.go @@ -85,7 +85,7 @@ func generateRedisStandaloneParams(cr *redisv1beta2.Redis) statefulSetParameters res.ImagePullSecrets = cr.Spec.KubernetesConfig.ImagePullSecrets } if cr.Spec.Storage != nil { - res.PersistentVolumeClaim = cr.Spec.Storage.CommonAttributes.VolumeClaimTemplate + res.PersistentVolumeClaim = cr.Spec.Storage.VolumeClaimTemplate } if cr.Spec.RedisConfig != nil { res.ExternalConfig = cr.Spec.RedisConfig.AdditionalRedisConfig @@ -116,8 +116,8 @@ func generateRedisStandaloneContainerParams(cr *redisv1beta2.Redis) containerPar } if cr.Spec.Storage != nil { - containerProp.AdditionalVolume = cr.Spec.Storage.CommonAttributes.VolumeMount.Volume - containerProp.AdditionalMountPath = cr.Spec.Storage.CommonAttributes.VolumeMount.MountPath + containerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume + containerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath } if cr.Spec.KubernetesConfig.ExistingPasswordSecret != nil { @@ -178,8 +178,8 @@ func generateRedisStandaloneInitContainerParams(cr *redisv1beta2.Redis) initCont } if cr.Spec.Storage != nil { - initcontainerProp.AdditionalVolume = cr.Spec.Storage.CommonAttributes.VolumeMount.Volume - initcontainerProp.AdditionalMountPath = cr.Spec.Storage.CommonAttributes.VolumeMount.MountPath + initcontainerProp.AdditionalVolume = cr.Spec.Storage.VolumeMount.Volume + initcontainerProp.AdditionalMountPath = cr.Spec.Storage.VolumeMount.MountPath } if cr.Spec.Storage != nil { initcontainerProp.PersistenceEnabled = &trueProperty