feat: add support for extraPVCs

This commit introduces the `extraPVCs` field in CRD,
allowing users to attach additional PVC to main container. #2126

Signed-off-by: Emin Aktas <[email protected]>

Author: eminaktas

config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml

@@ -563,6 +563,13 @@ type PodSpec struct {
 	HookScript                   string                            `json:"hookScript,omitempty"`
 	Lifecycle                    corev1.Lifecycle                  `json:"lifecycle,omitempty"`
 	TopologySpreadConstraints    []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
+	ExtraPVCs                    []ExtraPVC                        `json:"extraPVCs,omitempty"`
+}
+
+type ExtraPVC struct {
+	VolumeClaimTemplate corev1.PersistentVolumeClaim `json:"volumeClaimTemplate,omitempty"`
+	MountPath           string                       `json:"mountPath,omitempty"`
+	ReadOnly            *bool                        `json:"readOnly,omitempty"`
 }
 
 func (spec *PodSpec) HasSidecarInternalSecret(secret *corev1.Secret) bool {
@@ -1522,6 +1529,14 @@ func AddSidecarContainers(log logr.Logger, existing, sidecars []corev1.Container
 	return existing
 }
 
+func AddExtraVolumes(log logr.Logger, existing []corev1.Volume, extraVolumes []ExtraPVC) []corev1.Volume {
+	if len(extraVolumes) == 0 {
+		return existing
+	}
+
+	return existing
+}
+
 func AddSidecarVolumes(log logr.Logger, existing, sidecarVolumes []corev1.Volume) []corev1.Volume {
 	if len(sidecarVolumes) == 0 {
 		return existing

deploy/bundle.yaml

@@ -48,6 +48,19 @@ func StatefulSet(ctx context.Context, cl client.Client, sfs api.StatefulApp, pod
 		return nil, fmt.Errorf("failed to get volumes %v", err)
 	}
 
+	var extraPVCMounts []corev1.VolumeMount
+	if cr.Spec.PXC.ExtraPVCs != nil {
+		for _, extraPVC := range cr.Spec.PXC.ExtraPVCs {
+			sfsVolume.PVCs = append(sfsVolume.PVCs, extraPVC.VolumeClaimTemplate)
+			pvcMount := corev1.VolumeMount{
+				Name:      extraPVC.VolumeClaimTemplate.GetName(),
+				MountPath: extraPVC.MountPath,
+				ReadOnly:  *extraPVC.ReadOnly,
+			}
+			extraPVCMounts = append(extraPVCMounts, pvcMount)
+		}
+	}
+
 	if sfsVolume != nil && sfsVolume.Volumes != nil {
 		pod.Volumes = sfsVolume.Volumes
 	}
@@ -57,6 +70,11 @@ func StatefulSet(ctx context.Context, cl client.Client, sfs api.StatefulApp, pod
 		return nil, errors.Wrap(err, "app container")
 	}
 
+	// Attach extraPVCs mounts
+	if extraPVCMounts != nil {
+		appC.VolumeMounts = append(appC.VolumeMounts, extraPVCMounts...)
+	}
+
 	pmmC, err := sfs.PMMContainer(ctx, cl, cr.Spec.PMM, secret, cr)
 	if err != nil {
 		log.Info(`"pmm container error"`, "secrets", cr.Spec.SecretsName, "internalSecrets", "internal-"+cr.Name, "error", err)