reorgnise controller permissions

Signed-off-by: Guilherme Cassolato <guicassolato@gmail.com>
Kuadrant · Nov 8, 2024 · ecba7c6 · ecba7c6
1 parent 6f11120
commit ecba7c6
Show file tree

Hide file tree

Showing 21 changed files with 73 additions and 167 deletions.
diff --git a/api/v1/authpolicy_types.go b/api/v1/authpolicy_types.go
@@ -70,11 +70,6 @@ func (p *AuthPolicy) GetLocator() string {
 	return machinery.LocatorFromObject(p)
 }
 
-// TODO: remove
-func (p *AuthPolicy) IsAtomicOverride() bool {
-	return p.Spec.Overrides != nil && p.Spec.Overrides.Strategy == AtomicMergeStrategy
-}
-
 // DEPRECATED: Use GetTargetRefs instead
 func (p *AuthPolicy) GetTargetRef() gatewayapiv1alpha2.LocalPolicyTargetReference {
 	return p.Spec.TargetRef.LocalPolicyTargetReference
@@ -399,18 +394,6 @@ func (r *MergeablePatternExpressions) WithSource(source string) MergeableRule {
 	return r
 }
 
-type MergeablePatternExpressionOrRef struct {
-	authorinov1beta3.PatternExpressionOrRef `json:",inline"`
-	Source                                  string `json:"-"`
-}
-
-func (r *MergeablePatternExpressionOrRef) GetSpec() any      { return r.PatternExpressionOrRef }
-func (r *MergeablePatternExpressionOrRef) GetSource() string { return r.Source }
-func (r *MergeablePatternExpressionOrRef) WithSource(source string) MergeableRule {
-	r.Source = source
-	return r
-}
-
 type MergeableAuthenticationSpec struct {
 	authorinov1beta3.AuthenticationSpec `json:",inline"`
 	Source                              string `json:"-"`

diff --git a/api/v1/ratelimitpolicy_types.go b/api/v1/ratelimitpolicy_types.go
@@ -28,12 +28,6 @@ import (
 	"github.com/kuadrant/kuadrant-operator/pkg/utils"
 )
 
-const (
-	// TODO: remove after fixing the integration tests that still depend on these
-	RateLimitPolicyBackReferenceAnnotationName   = "kuadrant.io/ratelimitpolicies"
-	RateLimitPolicyDirectReferenceAnnotationName = "kuadrant.io/ratelimitpolicy"
-)
-
 var (
 	RateLimitPolicyGroupKind  = schema.GroupKind{Group: GroupVersion.Group, Kind: "RateLimitPolicy"}
 	RateLimitPoliciesResource = GroupVersion.WithResource("ratelimitpolicies")

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
@@ -105,7 +105,7 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/kuadrant/kuadrant-operator:latest
-    createdAt: "2024-11-08T14:46:34Z"
+    createdAt: "2024-11-08T16:32:32Z"
     description: A Kubernetes Operator to manage the lifecycle of the Kuadrant system
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -286,26 +286,13 @@ spec:
           resources:
           - gatewayclasses
           verbs:
+          - get
           - list
           - watch
         - apiGroups:
           - gateway.networking.k8s.io
           resources:
-          - gateways/finalizers
-          verbs:
-          - update
-        - apiGroups:
-          - gateway.networking.k8s.io
-          resources:
-          - gateways/status
-          - httproutes/status
-          verbs:
-          - get
-          - patch
-          - update
-        - apiGroups:
-          - gateway.networking.k8s.io
-          resources:
+          - gateways
           - httproutes
           verbs:
           - get
@@ -314,22 +301,19 @@ spec:
           - update
           - watch
         - apiGroups:
-          - install.istio.io
+          - gateway.networking.k8s.io
           resources:
-          - istiooperators
+          - gateways/status
+          - httproutes/status
           verbs:
-          - create
           - get
-          - list
           - patch
           - update
-          - watch
         - apiGroups:
           - kuadrant.io
           resources:
           - authpolicies
           - dnsrecords
-          - kuadrants
           - ratelimitpolicies
           verbs:
           - create
@@ -344,7 +328,6 @@ spec:
           resources:
           - authpolicies/finalizers
           - dnspolicies/finalizers
-          - kuadrants/finalizers
           - ratelimitpolicies/finalizers
           - tlspolicies/finalizers
           verbs:
@@ -380,21 +363,19 @@ spec:
           verbs:
           - get
         - apiGroups:
-          - limitador.kuadrant.io
+          - kuadrant.io
           resources:
-          - limitadors
+          - kuadrants
           verbs:
-          - create
-          - delete
           - get
           - list
           - patch
           - update
           - watch
         - apiGroups:
-          - networking.istio.io
+          - limitador.kuadrant.io
           resources:
-          - envoyfilters
+          - limitadors
           verbs:
           - create
           - delete
@@ -404,9 +385,9 @@ spec:
           - update
           - watch
         - apiGroups:
-          - operator.authorino.kuadrant.io
+          - networking.istio.io
           resources:
-          - authorinos
+          - envoyfilters
           verbs:
           - create
           - delete
@@ -416,11 +397,12 @@ spec:
           - update
           - watch
         - apiGroups:
-          - operator.istio.io
+          - operator.authorino.kuadrant.io
           resources:
-          - istios
+          - authorinos
           verbs:
           - create
+          - delete
           - get
           - list
           - patch

diff --git a/charts/kuadrant-operator/templates/manifests.yaml b/charts/kuadrant-operator/templates/manifests.yaml
@@ -8637,26 +8637,13 @@ rules:
   resources:
   - gatewayclasses
   verbs:
+  - get
   - list
   - watch
 - apiGroups:
   - gateway.networking.k8s.io
   resources:
-  - gateways/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
-  - gateways/status
-  - httproutes/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - gateway.networking.k8s.io
-  resources:
+  - gateways
   - httproutes
   verbs:
   - get
@@ -8665,22 +8652,19 @@ rules:
   - update
   - watch
 - apiGroups:
-  - install.istio.io
+  - gateway.networking.k8s.io
   resources:
-  - istiooperators
+  - gateways/status
+  - httproutes/status
   verbs:
-  - create
   - get
-  - list
   - patch
   - update
-  - watch
 - apiGroups:
   - kuadrant.io
   resources:
   - authpolicies
   - dnsrecords
-  - kuadrants
   - ratelimitpolicies
   verbs:
   - create
@@ -8695,7 +8679,6 @@ rules:
   resources:
   - authpolicies/finalizers
   - dnspolicies/finalizers
-  - kuadrants/finalizers
   - ratelimitpolicies/finalizers
   - tlspolicies/finalizers
   verbs:
@@ -8731,21 +8714,19 @@ rules:
   verbs:
   - get
 - apiGroups:
-  - limitador.kuadrant.io
+  - kuadrant.io
   resources:
-  - limitadors
+  - kuadrants
   verbs:
-  - create
-  - delete
   - get
   - list
   - patch
   - update
   - watch
 - apiGroups:
-  - networking.istio.io
+  - limitador.kuadrant.io
   resources:
-  - envoyfilters
+  - limitadors
   verbs:
   - create
   - delete
@@ -8755,9 +8736,9 @@ rules:
   - update
   - watch
 - apiGroups:
-  - operator.authorino.kuadrant.io
+  - networking.istio.io
   resources:
-  - authorinos
+  - envoyfilters
   verbs:
   - create
   - delete
@@ -8767,11 +8748,12 @@ rules:
   - update
   - watch
 - apiGroups:
-  - operator.istio.io
+  - operator.authorino.kuadrant.io
   resources:
-  - istios
+  - authorinos
   verbs:
   - create
+  - delete
   - get
   - list
   - patch