Fix the mirror PV handling

mgradm/shared/kubernetes/deployment.go

@@ -80,12 +80,18 @@ func getServerDeployment(
 	}
 
 	if mirrorPvName != "" {
-		// Add a mount for the mirror
+		// Add a volume for the mirror
 		mounts = append(mounts, types.VolumeMount{MountPath: "/mirror", Name: mirrorPvName})
 
 		// Add the environment variable for the deployment to use the mirror
 		// This doesn't makes sense for migration as the setup script is not executed
 		envs = append(envs, core.EnvVar{Name: "MIRROR_PATH", Value: "/mirror"})
+
+		// Add the volume mount now since we don't want it in the init container ones.
+		volumeMounts = append(volumeMounts, core.VolumeMount{
+			Name:      mirrorPvName,
+			MountPath: "/mirror",
+		})
 	}
 
 	volumes := kubernetes.CreateVolumes(mounts)

shared/kubernetes/pvc.go

@@ -53,43 +53,34 @@ func hasPersistentVolumeClaim(namespace string, name string) bool {
 	return err == nil && strings.TrimSpace(string(out)) != ""
 }
 
-// Contains the data extracted from the PV to create the linked PVC for it.
-type pvData struct {
-	ClaimRef struct {
-		Name      string
-		Namespace string
-	}
-	StorageClass string
-	AccessModes  []core.PersistentVolumeAccessMode
-	Size         string
-}
-
 // CreatePersistentVolumeClaimForVolume creates a PVC bound to a specific Volume.
 func CreatePersistentVolumeClaimForVolume(
 	namespace string,
 	volumeName string,
 ) error {
 	// Get the PV Storage class and claimRef
 	out, err := utils.RunCmdOutput(zerolog.DebugLevel,
-		"kubectl", "get", "pv", volumeName, "-n", namespace,
-		"-o", `jsonpath={"{\"claimRef\": "}{.spec.claimRef}, "storageClass": "{.spec.storageClassName}", `+
-			`"accessModes": {.spec.accessModes}, "size": "{.spec.capacity.storage}{"\"}"}`,
+		"kubectl", "get", "pv", volumeName, "-n", namespace, "-o", "json",
 	)
 	if err != nil {
 		return err
 	}
-	var pv pvData
+	var pv core.PersistentVolume
 	if err := json.Unmarshal(out, &pv); err != nil {
 		return utils.Errorf(err, L("failed to parse pv data"))
 	}
 
 	// Ensure the claimRef of the volume is for our PVC
-	if pv.ClaimRef.Name != volumeName && pv.ClaimRef.Namespace != namespace {
-		return fmt.Errorf(L("the %[1]s volume should reference the %[2]s claim in %[3]s namespace"), volumeName, namespace)
+	if pv.Spec.ClaimRef == nil || pv.Spec.ClaimRef.Name != volumeName && pv.Spec.ClaimRef.Namespace != namespace {
+		return fmt.Errorf(L("the %[1]s volume has to reference the %[1]s claim in %[2]s namespace"), volumeName, namespace)
 	}
 
 	// Create the PVC object
-	pvc := newPersistentVolumeClaim(namespace, volumeName, pv.StorageClass, pv.Size, pv.AccessModes, false)
+	pvc := newPersistentVolumeClaim(
+		namespace, volumeName, pv.Spec.StorageClassName,
+		pv.Spec.Capacity.Storage().String(), pv.Spec.AccessModes, false,
+	)
+	pvc.Spec.VolumeName = volumeName
 
 	return Apply([]runtime.Object{&pvc}, L("failed to run the persistent volume claims"))
 }

uyuni-tools.changes.cbosdo.k8s-mirror-fix

@@ -0,0 +1 @@
+- Fix mirror pv check when the pv isn't claimed