GH-661 comments p2 and rebase

Kuadrant · Feb 21, 2024 · d03a768 · d03a768
1 parent 9e08bd5
commit d03a768
Show file tree

Hide file tree

Showing 18 changed files with 241 additions and 244 deletions.
diff --git a/bundle/manifests/mgc-add-on-manager_v1_serviceaccount.yaml b/bundle/manifests/mgc-add-on-manager_v1_serviceaccount.yaml
diff --git a/bundle/manifests/mgc-kuadrant-addon_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/mgc-kuadrant-addon_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/bundle/manifests/mgc-kuadrant-addon_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/bundle/manifests/mgc-kuadrant-addon_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/bundle/manifests/multicluster-gateway-controller.clusterserviceversion.yaml b/bundle/manifests/multicluster-gateway-controller.clusterserviceversion.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2024-02-02T12:19:59Z"
+    createdAt: "2024-02-21T15:02:50Z"
     operators.operatorframework.io/builder: operator-sdk-v1.28.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: multicluster-gateway-controller.v0.0.0
@@ -34,6 +34,20 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - ""
+          resources:
+          - configmaps
+          - events
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - ""
           resources:
@@ -43,6 +57,51 @@ spec:
           - get
           - list
           - watch
+        - apiGroups:
+          - addon.open-cluster-management.io
+          resources:
+          - clustermanagementaddons
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - addon.open-cluster-management.io
+          resources:
+          - clustermanagementaddons/finalizers
+          verbs:
+          - update
+        - apiGroups:
+          - addon.open-cluster-management.io
+          resources:
+          - managedclusteraddons
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - update
+          - watch
+        - apiGroups:
+          - addon.open-cluster-management.io
+          resources:
+          - managedclusteraddons/finalizers
+          verbs:
+          - update
+        - apiGroups:
+          - addon.open-cluster-management.io
+          resources:
+          - managedclusteraddons/status
+          verbs:
+          - patch
+          - update
+        - apiGroups:
+          - authorization.k8s.io
+          resources:
+          - subjectaccessreviews
+          verbs:
+          - create
+          - get
         - apiGroups:
           - cert-manager.io
           resources:
@@ -55,13 +114,31 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - certificates.k8s.io
+          resources:
+          - certificatesigningrequests
+          - certificatesigningrequests/approval
+          verbs:
+          - create
+          - get
+          - list
+          - update
+          - watch
+        - apiGroups:
+          - certificates.k8s.io
+          resources:
+          - signers
+          verbs:
+          - approve
         - apiGroups:
           - cluster.open-cluster-management.io
           resources:
           - managedclusters
           verbs:
           - get
           - list
+          - update
           - watch
         - apiGroups:
           - cluster.open-cluster-management.io
@@ -75,6 +152,17 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - coordination.k8s.io
+          resources:
+          - leases
+          verbs:
+          - create
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - gateway.networking.k8s.io
           resources:
@@ -136,13 +224,36 @@ spec:
           - get
           - list
           - watch
+        - apiGroups:
+          - kuadrant.io
+          resources:
+          - kuadrant
+          verbs:
+          - create
+          - get
+          - list
+          - update
+          - watch
+        - apiGroups:
+          - rbac.authorization.k8s.io
+          resources:
+          - rolebindings
+          - roles
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - update
+          - watch
         - apiGroups:
           - work.open-cluster-management.io
           resources:
           - manifestworks
           verbs:
           - create
           - delete
+          - deletecollection
           - get
           - list
           - patch

diff --git a/cmd/gateway_controller/main.go b/cmd/gateway_controller/main.go
@@ -20,7 +20,6 @@ import (
 	"flag"
 	"os"
 
-	certmanv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
 	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta1"
 	workv1 "open-cluster-management.io/api/work/v1"
@@ -41,8 +40,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	addon_manager "github.com/Kuadrant/multicluster-gateway-controller/cmd/gateway_controller/addon-manager"
-	"github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1"
+	"github.com/Kuadrant/multicluster-gateway-controller/cmd/gateway_controller/ocm"
 	"github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/gateway"
 	"github.com/Kuadrant/multicluster-gateway-controller/pkg/placement"
 	"github.com/Kuadrant/multicluster-gateway-controller/pkg/policysync"
@@ -143,7 +141,7 @@ func main() {
 	}
 
 	// add addon-manager
-	if err = mgr.Add(addon_manager.AddonRunnable{}); err != nil {
+	if err = mgr.Add(ocm.AddonRunnable{}); err != nil {
 		setupLog.Error(err, "unable to add addon manager runnable")
 		os.Exit(1)
 	}

diff --git a/...controller/addon-manager/addon-manager.go → cmd/gateway_controller/ocm/addon-manager.go b/...controller/addon-manager/addon-manager.go → cmd/gateway_controller/ocm/addon-manager.go
@@ -1,4 +1,4 @@
-package addon_manager
+package ocm
 
 import (
 	"context"

diff --git a/...nager/manifests/cluster-role-binding.yaml → ...r/ocm/manifests/cluster-role-binding.yaml b/...nager/manifests/cluster-role-binding.yaml → ...r/ocm/manifests/cluster-role-binding.yaml
diff --git a/...addon-manager/manifests/cluster-role.yaml → ...ontroller/ocm/manifests/cluster-role.yaml b/...addon-manager/manifests/cluster-role.yaml → ...ontroller/ocm/manifests/cluster-role.yaml
diff --git a/...manager/manifests/kuadrant-namespace.yaml → ...ler/ocm/manifests/kuadrant-namespace.yaml b/...manager/manifests/kuadrant-namespace.yaml → ...ler/ocm/manifests/kuadrant-namespace.yaml
diff --git a/...ler/addon-manager/manifests/kuadrant.yaml → ...ay_controller/ocm/manifests/kuadrant.yaml b/...ler/addon-manager/manifests/kuadrant.yaml → ...ay_controller/ocm/manifests/kuadrant.yaml
diff --git a/...don-manager/manifests/operator-group.yaml → ...troller/ocm/manifests/operator-group.yaml b/...don-manager/manifests/operator-group.yaml → ...troller/ocm/manifests/operator-group.yaml
diff --git a/...addon-manager/manifests/subscription.yaml → ...ontroller/ocm/manifests/subscription.yaml b/...addon-manager/manifests/subscription.yaml → ...ontroller/ocm/manifests/subscription.yaml
diff --git a/config/rbac/add-on-clusterrole-binding.yaml b/config/rbac/add-on-clusterrole-binding.yaml