Merge pull request noobaa#1732 from liranmauda/liran-backport-into-5.19

[Backport into 5.19] Fix routes permission issues And Avoid updating cpu and memory in pvc template

Author: liranmauda

deploy/role_core.yaml

@@ -45,3 +45,13 @@ rules:
   - securitycontextconstraints
   verbs:
   - use
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  verbs:
+  - get
+  - create
+  - update
+  - list
+  - watch

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 {
@@ -1387,7 +1386,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,

pkg/bundle/deploy.go

@@ -6501,7 +6501,7 @@ subjects:
   name: custom-metrics-prometheus-adapter
 `
 
-const Sha256_deploy_role_core_yaml = "c3cfb5b87298224fd6e4e4bff32d3948ad168a0110b8569118a260739ef5d5e7"
+const Sha256_deploy_role_core_yaml = "1ec420603dcec64b247852d106535a85a1a866129f78f790c2e5c9285f029ae7"
 
 const File_deploy_role_core_yaml = `apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -6550,6 +6550,16 @@ rules:
   - securitycontextconstraints
   verbs:
   - use
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  verbs:
+  - get
+  - create
+  - update
+  - list
+  - watch
 `
 
 const Sha256_deploy_role_db_yaml = "bc7eeca1125dfcdb491ab8eb69e3dcbce9f004a467b88489f85678b3c6872cce"