fix default disk pvc resources

Kuadrant · Sep 4, 2023 · 8c2a8f0 · 8c2a8f0
1 parent 22c3579
commit 8c2a8f0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 33 deletions.
diff --git a/bundle/manifests/limitador-operator.clusterserviceversion.yaml b/bundle/manifests/limitador-operator.clusterserviceversion.yaml
@@ -36,7 +36,7 @@ metadata:
  capabilities: Basic Install
  categories: Integration & Delivery
  containerImage: quay.io/kuadrant/limitador-operator:latest
- createdAt: "2023-09-01T15:47:50Z"
+ createdAt: "2023-09-04T14:22:55Z"
  operators.operatorframework.io/builder: operator-sdk-v1.28.1
  operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
  repository: https://github.com/Kuadrant/limitador-operator
@@ -63,7 +63,9 @@ spec:
  - ""
  resources:
  - configmaps
+ - persistentvolumeclaims
  - secrets
+ - services
  verbs:
  - create
  - delete
@@ -82,17 +84,6 @@ spec:
  - list
  - update
  - watch
- - apiGroups:
- - ""
- resources:
- - services
- verbs:
- - create
- - delete
- - get
- - list
- - update
- - watch
  - apiGroups:
  - limitador.kuadrant.io
  resources:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -9,7 +9,9 @@ rules:
  - ""
  resources:
  - configmaps
+ - persistentvolumeclaims
  - secrets
+ - services
  verbs:
  - create
  - delete
@@ -28,17 +30,6 @@ rules:
  - list
  - update
  - watch
-- apiGroups:
- - ""
- resources:
- - services
- verbs:
- - create
- - delete
- - get
- - list
- - update
- - watch
 - apiGroups:
  - limitador.kuadrant.io
  resources:

diff --git a/controllers/limitador_controller.go b/controllers/limitador_controller.go
@@ -45,10 +45,9 @@ type LimitadorReconciler struct {
 //+kubebuilder:rbac:groups=limitador.kuadrant.io,resources=limitadors,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=limitador.kuadrant.io,resources=limitadors/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=limitador.kuadrant.io,resources=limitadors/finalizers,verbs=update
-//+kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;delete
 //+kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;list;watch;create;update;delete
 //+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;delete
-//+kubebuilder:rbac:groups="",resources=configmaps;secrets,verbs=get;list;watch;create;update;delete
+//+kubebuilder:rbac:groups="",resources=services;configmaps;secrets;persistentvolumeclaims,verbs=get;list;watch;create;update;delete
 
 func (r *LimitadorReconciler) Reconcile(eventCtx context.Context, req ctrl.Request) (ctrl.Result, error) {
  logger := r.Logger().WithValues("limitador", req.NamespacedName)

diff --git a/pkg/limitador/k8s_objects.go b/pkg/limitador/k8s_objects.go
@@ -222,6 +222,12 @@ func PVC(limitador *limitadorv1alpha1.Limitador) *v1.PersistentVolumeClaim {
  AccessModes: []v1.PersistentVolumeAccessMode{
  v1.PersistentVolumeAccessMode("ReadWriteOnce"),
  },
+ Resources: v1.ResourceRequirements{
+ Requests: v1.ResourceList{
+ // Default value for resources
+ v1.ResourceStorage: resource.MustParse("1Gi"),
+ },
+ },
  },
  }
 
@@ -237,15 +243,12 @@ func PVC(limitador *limitadorv1alpha1.Limitador) *v1.PersistentVolumeClaim {
  }
 
  // Default value for resources
- resources := resource.MustParse("1Gi")
  if limitador.Spec.Storage.Disk.PVC.Resources != nil {
- resources = limitador.Spec.Storage.Disk.PVC.Resources.Requests
- }
-
- pvc.Spec.Resources = v1.ResourceRequirements{
- Requests: v1.ResourceList{
- v1.ResourceStorage: resources,
- },
+ pvc.Spec.Resources = v1.ResourceRequirements{
+ Requests: v1.ResourceList{
+ v1.ResourceStorage: limitador.Spec.Storage.Disk.PVC.Resources.Requests,
+ },
+ }
  }
  }