Merge pull request #1720 from jackyalbo/jacky-operator-fix

Avoid updating cpu and memory in pvc template

Author: jackyalbo

pkg/backingstore/backingstore.go

@@ -247,6 +247,9 @@ const (
 	// Dev ENV minimal resources
 	devEnvMinCPUString    string = "500m"
 	devEnvMinMemoryString string = "500Mi"
+
+	// Default volume size for pv-pool backing store
+	defaultVolumeSize = int64(20 * 1024 * 1024 * 1024) // 20Gi=20*1024^3
 )
 
 // CmdCreatePVPool returns a CLI command

pkg/backingstore/reconciler.go

@@ -567,7 +567,6 @@ func (r *Reconciler) ReadSystemInfo() error {
 			))
 		}
 
-		const defaultVolumeSize = int64(20 * 1024 * 1024 * 1024) // 20Gi=20*1024^3
 		var volumeSize int64
 		pvPool := r.BackingStore.Spec.PVPool
 		if pvPool.VolumeResources != nil {
@@ -1393,7 +1392,14 @@ func (r *Reconciler) updatePvcTemplate() {
 	} else if r.NooBaa.Spec.PVPoolDefaultStorageClass != nil {
 		r.PvcAgentTemplate.Spec.StorageClassName = r.NooBaa.Spec.PVPoolDefaultStorageClass
 	}
-	r.PvcAgentTemplate.Spec.Resources = *r.BackingStore.Spec.PVPool.VolumeResources
+	var volumeSize resource.Quantity
+	pvPool := r.BackingStore.Spec.PVPool
+	if pvPool.VolumeResources != nil {
+		volumeSize = pvPool.VolumeResources.Requests[corev1.ResourceStorage]
+	} else {
+		volumeSize = *resource.NewQuantity(defaultVolumeSize, resource.BinarySI)
+	}
+	r.PvcAgentTemplate.Spec.Resources.Requests[corev1.ResourceStorage] = volumeSize
 	r.PvcAgentTemplate.Labels = map[string]string{
 		"app":  "noobaa",
 		"pool": r.BackingStore.Name,

scripts/run-golangci-lint.sh

@@ -27,7 +27,7 @@ MODE="${1}"
 # Function to install golangci-lint (for makefile mode)
 install_golangci_lint() {
     echo "Installing the latest golangci-lint with local toolchain"
-    if ! go install -a "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest"
+    if ! go install -a "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0"
     then
         echo "⚠️ Failed to install golangci-lint"
         exit 0